| commit | da19a9eeec5177a3632a0033f5894affb70b65a1 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Apr 22 20:42:25 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 22 20:42:25 2021 +0000 |
| tree | 87611a13927dbbd03ed3a6efe9f44700c433b172 | |
| parent | 843c4eecc35cba73f41f0be54f48b5fb6edfd540 [diff] | |
| parent | f6374c6bec14a92d47ba32f0a00966c8532b0fb1 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 679c657122 -s ours am: f6374c6bec -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684653 Change-Id: Ia2266cdb0891bde13a8b2cc9751f157bfd0d7232