tree 1cb7cf734cfe78cfc1c31ca67b4f7fe44c9a5819
parent 2270f05e08e4aeb4953a1c014b76edb0fdb50c5d
parent 8ea3acc48296cecf32c54c0a423af910e1010e2f
author TreeHugger Robot <treehugger-gerrit@google.com> 1604113899 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604113899 +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: Ie039d2a279a7a850a30bab43317b6a21e6abbefd