commit | b69b2d19fe0a7f27394c344ff09be7afa92a2e68 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Sun Jul 04 04:57:55 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Jul 04 04:57:55 2021 +0000 |
tree | df3e2531dbc2062eab1729f982bdb9036443d365 | |
parent | dd727c298ea460b85f0a2609d4b11786febfa5f3 [diff] | |
parent | dc888dd6bf6c9d9a3d966b888b0c07d6af2f3198 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: d89c0d5ded -s ours am: dc888dd6bf -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15199723 Change-Id: Ief266cfd10640b9a9557cce7d6803e380f9cb5c4