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