| commit | 7f2483c42ac82dddb956f0b3ab5e8e55e7d4dd36 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Apr 22 20:44:57 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 22 20:44:57 2021 +0000 |
| tree | f8b97a8a1301ffc77a08f9b17a16d5e1af87b2a7 | |
| parent | 28f94dd1ee42cd7f1592920d9457bc08a0ed807c [diff] | |
| parent | 843c4eecc35cba73f41f0be54f48b5fb6edfd540 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 7dbd97e972 -s ours am: 975541d9f0 -s ours am: 843c4eecc3 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684418 Change-Id: Idb8787667784ab3a11c0e8add5dfdadbc38afbe5