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