summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Songchun Fan <schfan@google.com> 2022-06-29 03:16:50 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-06-29 03:16:50 +0000
commitd3199a51e71de7afa385cd7f302da29a1b4702ec (patch)
treea4c4dc3dc48d5c387346ad1d458fb76a2c335e90
parent106e15731329a1a89df75829e60f823dede03b51 (diff)
parente2836e4fb4e8b78bb30fccd01e47921ee01fe956 (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: 6047695bea -s ours am: e2836e4fb4 -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: Ie934944a4fe2c66ba5ccd61d3d6ed7b51900ed87 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions