tree 61b35fe91f66e04ee0724edbca7b4b89b4a5e934
parent 98c4ea349099316693b833c551e32523a8629eda
parent b5a3259d6a1165ad21624f9b3a7e17749d37647c
author TreeHugger Robot <treehugger-gerrit@google.com> 1598290316 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598290316 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I3b367ea1dfc9e3959d97a871a027339ce715e45e