commit | df6dc40ac35c074cb0c4bb4441d6df833853ce3a | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Jan 11 01:29:19 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 11 01:29:19 2022 +0000 |
tree | d8eb8ae58f6d5f23d05bf9ba9d99e182d260ac24 | |
parent | 3ababf67c54d083196794d655e4e59e8fa4bd237 [diff] | |
parent | d2b6fe8cbf03fc06de8be55d20b0b212a55e88e5 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5da82b96fd -s ours am: d2b6fe8cbf -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1943426 Change-Id: I60697965890a59fd0a69925455ecb07bf4cbd317