tree 47d62c30a1a3287e5facb2debdeb11c35b010f34
parent 16d4c6db2ad3f85287e4a9ddfbebf55d3e5c4a6a
parent f237648d358a59848ce75db1838e46fbc7d19ff6
author TreeHugger Robot <treehugger-gerrit@google.com> 1597517443 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597517443 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: If2c851da9fe13a8451f7ab268140d7ce73cce852