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