commit | 7a11b64a091b23a6b38eb2da20cff97841aa74de | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Oct 07 07:52:22 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 07 07:52:22 2020 +0000 |
tree | 2e5b211674c5abd0545f0ade3f494fd4d47fc3fb | |
parent | 0bf831141b7a64e8beef73cb3e1db2890bea8601 [diff] | |
parent | 9ade8130a6c7b4fd07a318c5cf7299f557a2f66c [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 9ade8130a6 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12771094 Change-Id: I09015d5734c7aecd37c6803f5954d4b4d0622af0