tree 663453f92f06729f2f865238660bd9f7368dd159
parent 324645af2912d05642198a112261f69b0163915f
parent e941db9ff2ceeb21838ef9cc67eddc54b6896fa3
author TreeHugger Robot <treehugger-gerrit@google.com> 1599128519 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599128519 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: e941db9ff2 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8cfc8d4532dc127e54d077590dcd498c6384d0ea