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