tree f8b97a8a1301ffc77a08f9b17a16d5e1af87b2a7
parent 054fd43e2caf18bc6a1daaecc777694fc46d9593
parent e18a6f61b1ff0ba4f54bef97e2d207f3b341fcca
author Treehugger Robot <treehugger-gerrit@google.com> 1619124248 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619124248 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2b348a40ae -s ours am: e908f88308 -s ours am: e18a6f61b1 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iebe9720fb7f6adebf865ffd2118b49fbf512c304