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