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