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