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