tree 16eacf6bf9b6d168892bb179830f8a6c31db198b
parent 42dea5b4eabf747066289bc09ad154c590d40a9e
parent 5b8f3bede8fcc73f5ace9d5667463b1fcec7aee7
author Paul Duffin <paulduffin@google.com> 1591127938 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591127938 +0000

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

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