| commit | 292cb6d2accf97588489e5546366391ace59429d | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Sat Jun 26 18:36:26 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Jun 26 18:36:26 2021 +0000 |
| tree | d02424815454473f296dc37d39da844ddcfb4b7f | |
| parent | 61b8f3ea5e92657f4cbfcdfd78a4ce9bbdb16580 [diff] | |
| parent | 30d2940ec17714ae47ebcce891a9e94ce1a376d2 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 30d2940ec1 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15115566 Change-Id: I8abb9b4b336d74f5a48a24bf44ff37deae2b2961