| commit | 167d95bed7f5a8df0a25e9a1613281a7b617a037 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Apr 22 19:25:20 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 22 19:25:20 2021 +0000 |
| tree | 46722e29358f6eb0eb8b41b870086e52cc440409 | |
| parent | 2527e8e270e27435ac3e1b6e1f3fb4efd8038221 [diff] | |
| parent | b5b6d3680a81b26207d3d89814602af6a2e0e0d5 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b5b6d3680a -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684628 Change-Id: I15f1d3b2196972713765f0570793b6e71f3bd1a1