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