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