commit | 7fa68a87dae78c05dfc8552e9910e2b98f8ec40c | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Apr 22 19:28:34 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 22 19:28:34 2021 +0000 |
tree | 49812e2acb2bd5a636ba6fd91a2a89a9eb57d4c4 | |
parent | 31268e08d246ce39f6bb0ef8c9794a64ba8eaf53 [diff] | |
parent | 550e92d020dc0ef4f2cdb225fd29dda99bd3e8bf [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 199b0018ff -s ours am: 550e92d020 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684409 Change-Id: Ibf50492d1985909d6ab532e9f488ee9bdf3f9006