| commit | 20c5dbae837b36424760d97e3bf7f6fb599c3844 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Apr 22 21:46:17 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 22 21:46:17 2021 +0000 |
| tree | d63895f679e35a398374afc72208b4350afb9a60 | |
| parent | 47d1352999f767ffd71043d58733955800d1699a [diff] | |
| parent | 3ca99603e3651d32e41a5d5cb06ff61283a0ca70 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 07587bd2f7 -s ours am: 655c3483dd -s ours am: 3ca99603e3 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684930 Change-Id: I13818b9efcfab88fe676948814a26c85f3dcb5f5