commit | 050ea23ed55503c20dd832b33d464e0ea1de8ebb | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Sat Aug 07 20:03:54 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Aug 07 20:03:54 2021 +0000 |
tree | c0623aa010e23f23c4695a19f0bf4afb44023d4c | |
parent | 929a536ee56d9fb401cdbc4d207899c1379dddda [diff] | |
parent | 4ee26eaf3e1c3f42ab825d67a049bf1d64d87be7 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ebbcf6478f -s ours am: 7080c27189 -s ours am: 4144905cca -s ours am: 4ee26eaf3e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15489835 Change-Id: I4aa85ebf7545538ff2985f36736ea7f0d9e55f9f