tree 6bc1d197a89b4fc8733f35a0d78a7dde37e37be7
parent 0ed554de4dc06c75c52b1980aa4a4cdf38ae0bba
parent 27955484a4345770e0a9bd1c422fb86e3bd43d3e
author TreeHugger Robot <treehugger-gerrit@google.com> 1599133215 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599133215 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I5fec8ca744b967d7f17009433193adacb9a5c288