tree 9ef9f8155c655dd273b2d7f5e9c3c0e5a7817a38
parent a0421d89baedd49ca6462eb3fcd597c5476c9a44
parent f1fa5509753f997057666378b7120b67a289569d
author TreeHugger Robot <treehugger-gerrit@google.com> 1597884295 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597884295 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I3ad8e14fb132d5148d95fd36770967dd473b1c70