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