[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 3549fe64d5 -s ours am: 3e5bfadf7c -s ours am: 4549efe847 -s ours am: ce223cc3f2 -s ours am: 2e88be2af0 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23561189 Change-Id: Ie34f2c4e373b3dbcf08693975e4d41ff1a27922a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: