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