| commit | f4da93648e63273d0d40bb3f04dcdda2a0bd8e18 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Sat Apr 10 05:25:42 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Apr 10 05:25:42 2021 +0000 |
| tree | 666942b9e892bb01ba2e16d850f50642b2222129 | |
| parent | bbd84dfff49c50ff592aca0833f8677585305993 [diff] | |
| parent | bd8e63545b73ee36449fea76b979795778e97775 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: fe45cc15b7 -s ours am: bd8e63545b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14145985 Change-Id: I4385f1b085ee6fa94ddd41c3419218d1e8571451