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