[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 510ed7f0ac -s ours am: 247c8b9e61 -s ours am: f7636036d3 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21605050 Change-Id: Ic48f738c1209ed067e4fed0b966deaa6d4f8a329 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: