commit | 4f1135314feaa8b8f90e1f45faa419e0dd3a2f8b | [log] [tgz] |
---|---|---|
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 24 09:21:45 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 24 09:21:45 2020 +0000 |
tree | 8954f1d8bc317a1e3b1d929b0454c6a502e9aa82 | |
parent | aeebeb89c6f3314c817794dd0cca589b35a6d41c [diff] | |
parent | 94fb6b7163b3801b8380819739eda6bc67db1a52 [diff] |
[automerger skipped] Merge "Merge "Merge stage-aosp-rvc-ts-dev into rvc-dev" into rvc-dev am: e303dd658d am: cd85e10058 am: 03287bce0e" into rvc-qpr-dev-plus-aosp am: 94fb6b7163 -s ours am skip reason: Change-Id I5f50166322b662b457e1b79b2ce62c622ddd1013 with SHA-1 6c01bf5f87 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12203661 Change-Id: Ic56a7db4984cd64adc49979ede2b822f3587dd08