| commit | 296eca58b80c9582a8a30f2c97dcdb073374f76d | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Sep 03 04:56:21 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 03 04:56:21 2020 +0000 |
| tree | 994f971a7a14401a01a5f09676637d116e3c0ff8 | |
| parent | bf82e00e70390c71b4afa52c0251048613678a03 [diff] | |
| parent | 821265b102144189375709cffbcf8232747fd342 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: fb5578f1b5 -s ours am: 821265b102 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515618 Change-Id: Ieb1f32339bec7c5739f096a7186a4bbf0343ab4a