tree ff98d1580b87811cfd7d82ea116b339ccd57bd41
parent a2d39223f35887e9754b924c1bdfb1404091ae40
parent 2a35e0e3211d47ba2327891f9001fda74b14db3a
author TreeHugger Robot <treehugger-gerrit@google.com> 1593022269 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593022269 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I3f0815749fe3b9161d42a5743b3df74042a5fcb5