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