commit | d2fdb0c7df8bdf653fb41087dda430a7e70d7682 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Apr 22 19:27:50 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 22 19:27:50 2021 +0000 |
tree | 49812e2acb2bd5a636ba6fd91a2a89a9eb57d4c4 | |
parent | 7234450a5c1c99091e2ff4d9c34898b2c9172b5d [diff] | |
parent | 9cc37c9c2a1339f24f071ddb8b5a486c0de4ae33 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4152a1944e -s ours am: 9cc37c9c2a -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684931 Change-Id: If77259a3c3f971e9900baf3e24259b7c8f45dc80