[automerger skipped] Merge "Switch to standard naming scheme" am: c6bb075956 am: 9ab25e725e -s ours am: 75204a706f -s ours am: bf18db499f -s ours

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

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

Change-Id: Iceb037e8fab71fc1b01374b7dea393044180635d
This commit is contained in:
Paul Duffin
2020-06-29 11:20:23 +00:00
committed by Automerger Merge Worker

Diff Content Not Available