| commit | 5be6521ec4b136b54d41b2b1a6239fafe0cf2b7c | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Oct 05 16:23:59 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 05 16:23:59 2020 +0000 |
| tree | 6131e1f8debab82b8594819d9cc7d4b238415633 | |
| parent | 589cfeef0d179093ac7cd18e0d89cb5029ec38f1 [diff] | |
| parent | 4f8f275265ac77399111bfee16b974113f5b835f [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 67df9cf5f9 -s ours am: 4f8f275265 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12759562 Change-Id: I5fbe653440868b7a006e1fe52c272778cda63651