tree 46722e29358f6eb0eb8b41b870086e52cc440409
parent ff696632458e47b6b49e2695324b635930a7c605
parent 80cca06027fe1d4030b630f33fc6ef23a209c2b6
author Treehugger Robot <treehugger-gerrit@google.com> 1619121087 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619121087 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 80cca06027 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iabfb45aab57cb25662373e6a26795759abf4f759