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