tree 6f21e67aba157f05c30a059b932dbbd8f6814e4e
parent 6fe73b4cf2f777a1b9daa4b8673cc6c3d9877d28
parent c7bacdca449f5f09d27ff3bade46abb17e61364b
author TreeHugger Robot <treehugger-gerrit@google.com> 1596472956 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596472956 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: afab5784ea -s ours am: c7bacdca44 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12294087

Change-Id: Iea8800f98723a5ffa0d2f7e7f863ecf07dc1b66f