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