[automerger skipped] RESTRICT AUTOMERGE Replace all references to the new strings with a pre-existing string am: c5dca40da3 am: 0f6b3b1f6b -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23729523 Change-Id: Ide46dc13122fdead5002764968f3418a6ab21b20 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: