tree 9b8487c6ef97f007074fc080120518bc3478f0ce
parent 94261519bed23598ab3ed9a0fd69955ea7908ce0
parent dfc7fb7f758c4799966b89a3827f56db6388bcbb
author Paul Duffin <paulduffin@google.com> 1591126890 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591126890 +0000

Merge "Switch to standard naming scheme" am: b04aea2791

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

Change-Id: Ic1b75b3a6cd0db02d485ecd2ed3939d9faca8200