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