| commit | 77999ac695c828d44eab9621fa9ac08cf618a652 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Sat Apr 10 05:24:44 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Apr 10 05:24:44 2021 +0000 |
| tree | 666942b9e892bb01ba2e16d850f50642b2222129 | |
| parent | b5e420af8bc838042ad11a1f47e3c0d32ea33a4a [diff] | |
| parent | d49775ea4ce361a04ef894528a4684e0dad5ae8d [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: f8ecc90ea3 -s ours am: d49775ea4c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14146995 Change-Id: I9697943e89dc25f8b308d1517bc02c941c2b58ff