| commit | 42bc2d96532681b7118dbcb0de3ba34b1d58ea01 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Apr 22 20:01:53 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 22 20:01:53 2021 +0000 |
| tree | 87611a13927dbbd03ed3a6efe9f44700c433b172 | |
| parent | 2bbc0da8b4bdd4fef16283a0dabb2912e7155aef [diff] | |
| parent | 0e2edade627ce8a2db89d670e7e1a19393b48949 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 72c49f5bc3 -s ours am: 0e2edade62 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684928 Change-Id: Ieaec599473c4ef091a76a36df954bda1d8b540a3