[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15f18bb -s ours am: fa060284a6 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19163565 Change-Id: Ide87bada6b08375aac45f1aa96ca944282239ac4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: