tree 3353407d0dd86372090d17109b03f1f4237d7f8e
parent 6acfa90ddd52bf2958cdd20a456f8577423b14f3
parent 8ea3acc48296cecf32c54c0a423af910e1010e2f
author TreeHugger Robot <treehugger-gerrit@google.com> 1604113849 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604113849 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: b630b27967 -s ours am: 8ea3acc482 -s ours

am skip reason: subject contains skip directive

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

Change-Id: If1cda1a5ec3cead1ce1feb39dea6646720674903