| commit | 5ef3aaeb19004bbeb692e778d43499184b0cd6a5 | [log] [tgz] |
|---|---|---|
| author | Michael Groover <mpgroover@google.com> | Wed Feb 10 00:29:33 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 10 00:29:33 2021 +0000 |
| tree | 66b89d1a303ec83a6aa4b412b01c5b4c2f524b16 | |
| parent | a72c786a0ba32795353da71c277cefa8d4345dc5 [diff] | |
| parent | fd06cdb5af75c4bcebdf3ff9e1189e3b581e39ae [diff] |
[automerger skipped] resolve merge conflicts of 540b50bbe7397304436e3bbb63957c0cb265dbce to qt-qpr1-dev am: 8750762ce0 -s ours am: ebde0f1f40 -s ours am: fd06cdb5af -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: I62a5d1f133ad7fe224d2a173935aa2ebc1180070