| commit | 001d184b536e3ad6b48c9e9270337c82fe548cf0 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Sep 03 15:41:41 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 03 15:41:41 2020 +0000 |
| tree | c6c8cac41b1333df1316e1c39cb9dd311e5cddf4 | |
| parent | cf45e4ba22e096603e27f45d6d430842e969846a [diff] | |
| parent | e177a3da930233030a32fab2062c248640cacc44 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 94fbf790d7 -s ours am: e177a3da93 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515250 Change-Id: I572304d0a513ab314282b54f282c359ddbf5beb9