| commit | 8f82ab8f05d75fa0e9b3f09241d391a9caedcb21 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Sat Apr 10 00:08:05 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Apr 10 00:08:05 2021 +0000 |
| tree | 35e6252ca87abf40ac783b27e233b9fa845be918 | |
| parent | 61647a6979066e667343419d9fef79338d7b0f61 [diff] | |
| parent | eab0913ac372961e00d23558e6796908915af27e [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 603bcc5fb0 -s ours am: eab0913ac3 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14144581 Change-Id: I59d03e4422c30b33d199c7a7d314dae6b1693171