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