commit | ee6d5268331553a99b7f780ca8306811f296eb97 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Aug 13 22:51:44 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 13 22:51:44 2021 +0000 |
tree | 0996dc8a082fd0392713e95fa24c90e578060bda | |
parent | dba5e43aeb7fc04b69f335b42595c1eb071432c5 [diff] | |
parent | 7acc815b8eed8d4ce11f1dfa19fdb266c9ac7da5 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 7acc815b8e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15542425 Change-Id: I6e9ee255d315af28a22e342e8f345cb32bf715a4