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