commit | 98f84955f4ddef52b44a370e8cc10c1b8245f841 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Aug 18 02:51:49 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 18 02:51:49 2021 +0000 |
tree | a65ef3e33a1052079e6a7c4dd4ce0dddb986d226 | |
parent | 023052b1d2b93cb771e5f62c99141d039663441b [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: Ifd6d689570c9d487e928a42585e123701e4b25c2