commit | d6a61eed905b3bee0bff99148695936d14a3406e | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Apr 22 20:12:07 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 22 20:12:07 2021 +0000 |
tree | 46722e29358f6eb0eb8b41b870086e52cc440409 | |
parent | d0d8f77e5ce89b92ff765af2303f0d7eed83e2bb [diff] | |
parent | 4bdc1121da26f542fd1718547a5eadf9c95d80f3 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4bdc1121da -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684938 Change-Id: Iffc7d715b07cc5ec84af713d4de75fc9de71e15c