[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 1618dd33c9 -s ours am: 1d0cabae5a -s ours am: 243aafc61e -s ours am: 98f03b36f0 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21605061 Change-Id: I5994946db99a6a07323afd9da2c2868c283c90b6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: