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