commit | 921f98c7883e787166b53f0a8cc075af186ba937 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Sep 02 16:36:03 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 02 16:36:03 2020 +0000 |
tree | 82e1fa40059b27287458ee58f10281ab2364b024 | |
parent | 7eabaf095dfea8921c892441a31a1f80d3b55e32 [diff] | |
parent | 051a24c592e0e48c2404bb15dedc1093b7dc8807 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 051a24c592 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12508633 Change-Id: I32f8fdc2a6b9e1e23bca027ad7707b367e2e4cf5