commit | 0e2edade627ce8a2db89d670e7e1a19393b48949 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Apr 22 19:56:24 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 22 19:56:24 2021 +0000 |
tree | 46722e29358f6eb0eb8b41b870086e52cc440409 | |
parent | a78ee128182e30099c64933f59d531d711aa2d9b [diff] | |
parent | 72c49f5bc32a911274675c93d1e6e1137aebc5f9 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 72c49f5bc3 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684928 Change-Id: I91c0650f286ea0cdfdd318f76435ecc059edfe53