tree 46722e29358f6eb0eb8b41b870086e52cc440409
parent 0e2edade627ce8a2db89d670e7e1a19393b48949
parent 2b348a40ae8724efa8025bbccdfe4593a3b0394e
author Treehugger Robot <treehugger-gerrit@google.com> 1619121674 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619121674 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I2eb3a67276276504d359ae9051a070cd5c620663