[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 71e0275545 -s ours am: 0854405552 -s ours am: 3252d450a1 -s ours am: 931cd658f4 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19164234 Change-Id: I46ec9461103ebbd5a82b13eccae5743bb035c2a2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: