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