[automerger skipped] Merge "Switch to standard naming scheme" am: b04aea2791 am: 5b8f3bede8 -s ours am: 730b0510d6 -s ours

Browse Source

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

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

Change-Id: I235e3873020d3166689b22b38d7a0863ecc5bd42

...

This commit is contained in:

Paul Duffin

2020-06-02 20:12:27 +00:00

committed by Automerger Merge Worker

parent 9d4fcfedc3 730b0510d6

commit b05be93970

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