| commit | 2e5ed09e0e2dc055ebe3a5b358060b8d969c98b4 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Apr 13 21:32:46 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 13 21:32:46 2021 +0000 |
| tree | 4b5a5a287eafee37cfd5e2f8f779c72c4a141dc7 | |
| parent | b9650d6d47e7189ee3328d2d7f51289d55779966 [diff] | |
| parent | 23fbae438df1d3875c2fe880e3353c30fdfb87e6 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 4392ab06ca -s ours am: 052741d9cc -s ours am: 23fbae438d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14174183 Change-Id: I7af4cd2a6e5d0a3ddb3c6d1b63c50fb7d5a15541