| commit | b9aee121cf163b0f32d1432385c4f1581f8f8bf5 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Sun Jul 04 04:57:41 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Jul 04 04:57:41 2021 +0000 |
| tree | df3e2531dbc2062eab1729f982bdb9036443d365 | |
| parent | 8b092063f21c2f6911f87cc780aa8e168957d796 [diff] | |
| parent | 6d0fcbe90e522b9b455471ef745c20d66904ce37 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b0e22de395 -s ours am: 6d0fcbe90e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15200125 Change-Id: I18ef8fb270791e1afe53d58627d47165de9a6ffe