| commit | 58c483b685fb45a773e051276951dffd6ae79df6 | [log] [tgz] |
|---|---|---|
| author | Michael Groover <mpgroover@google.com> | Wed Feb 10 00:03:20 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 10 00:03:20 2021 +0000 |
| tree | 3e7b4b47794cf6643e2793e562d11b0125f1a8b7 | |
| parent | 911519f25a423f0332c03409a23c7b34a09d24f6 [diff] | |
| parent | ebde0f1f4083822d8b5b6b6e741daf50f9c4eba2 [diff] |
[automerger skipped] resolve merge conflicts of 540b50bbe7397304436e3bbb63957c0cb265dbce to qt-qpr1-dev am: 8750762ce0 -s ours am: ebde0f1f40 -s ours am skip reason: Change-Id I9b8786a321b1ba79d81b74c3041589f30df8e9c8 with SHA-1 a953322575 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13518142 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7ba88ee303eb38e19d124331abfda6e09a14afdf