| commit | b8403372c8ca5ac5f2ec6494231a26d04f5ec1bf | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Aug 18 02:51:37 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 18 02:51:37 2021 +0000 |
| tree | 98e2da379f9b115ce3a0cbb525ef4e76fdb50728 | |
| parent | ebf67700c690bdb74bece82c9824827ac63d3fa9 [diff] | |
| parent | 82a6e150ee19ce249980055abfb55c5d77868a4c [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 5055cf48b9 -s ours am: 1b5d7b4c2a -s ours am: 82a6e150ee -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15599697 Change-Id: I68d8842cf622a123f4f905167a20350b296e85bb