| commit | 5c96fe6b3be7610f5484671d736a53c477a92633 | [log] [tgz] |
|---|---|---|
| author | Songchun Fan <schfan@google.com> | Wed Jun 29 02:45:04 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 29 02:45:04 2022 +0000 |
| tree | ed9c18bb21c76784d7fae31e457626fe60d7c0a3 | |
| parent | 01a6c2e48381642ffdb5e2c723328bd2b7ff66f0 [diff] | |
| parent | c015bacf14aa639e9840e44bd775e0ac032fd146 [diff] |
[automerger skipped] Merge changes from topic "revert-16575908-dont_abandon_child_qt_dev-VVMFNIYZZO" into qt-dev am: 63257e0e97 am: 78bdbdd22e am: 1cad7c909a am: cc020a2462 -s ours am: c015bacf14 -s ours am skip reason: Merged-In I91170ba399b3a596320b3bd9c8188912e5c4f1be with SHA-1 7cd25e1f63 is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19092695 Change-Id: I9e52af7c6b782485d4f0dfe97524933e8b67c07f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>