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

Browse Source

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: Id9caafa93c919a5d9c4fe80a548cf21a5e890fab

...

This commit is contained in:

Paul Duffin

2020-06-29 11:37:45 +00:00

committed by Automerger Merge Worker

parent 07e9973060 da7a653abb

commit 72ec417178

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available