[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dcf2d1da52 -s ours am: 2ffa916b4e -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18096513 Change-Id: Ice532356335a5d9817e3e95b27af3a9010996d42 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: