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