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