Skip to content
Commit 75204a70 authored by Paul Duffin's avatar Paul Duffin Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Switch to standard naming scheme" am: c6bb0759 am: 9ab25e72 -s ours 

am skip reason: Change-Id I3b78fcbcacc3df787e171d6eedeef1e51b087615 with SHA-1 abebc6a8 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1325812

Change-Id: I165b9840ac39d209338478cae05804a4929b711a
parents 43ada632 9ab25e72
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment