| commit | 57e3cf10428bd822dd83ade657228f497b0d1c8b | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Apr 22 20:45:14 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 22 20:45:14 2021 +0000 |
| tree | f8b97a8a1301ffc77a08f9b17a16d5e1af87b2a7 | |
| parent | 7f2483c42ac82dddb956f0b3ab5e8e55e7d4dd36 [diff] | |
| parent | da19a9eeec5177a3632a0033f5894affb70b65a1 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 679c657122 -s ours am: f6374c6bec -s ours am: da19a9eeec -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684653 Change-Id: I8f96b3a94c1e51fea546e224dc3125ee5af6acab