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