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