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