commit | d6d65c186603a2f9972a1a2c72b077ccfe42e599 | [log] [tgz] |
---|---|---|
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 09 17:07:26 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 09 17:07:26 2021 +0000 |
tree | 21cd2a75024b46a463773d3d21686002cf806436 | |
parent | 8fc53c5a608921ecaa11c70c332aeb22e8015489 [diff] | |
parent | 8f3a1cd1faaa36b0a973dde97c211e494bf2d34b [diff] |
Merge "[automerger skipped] Merge "Backporting the change of ag/15629060 to qt-dev" into qt-dev am: 587162dfb8 am: 37d7f20996 am: 646b7c72ef am: b5edea8384 -s ours am: 34b0222470 -s ours am: 5f7004484d -s ours am: 5c57209810 -s ours" into sc-v2-dev-plus-aosp am: 8f3a1cd1fa -s ours am skip reason: Merged-In I7e2f95fd85e18127dc481f188ace8ad6effc4831 with SHA-1 8f005ffe4a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15744060 Change-Id: If46d06d40be680b0af3e230f4ea9e9db61d93e14