tree f6c040ec7bd1d8b8ddb56bde19823d871ae4e7c0
parent 4f1dc6586ef86fa065cc35c4c58cea053f7c64be
parent 473433fced99193304a3aa9fdc7473964d693a79
author TreeHugger Robot <treehugger-gerrit@google.com> 1597081117 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597081117 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: Id8014b785facd9616c882edbcd8ec1f405bbb1c8