tree 323d4df1544f7de603c8f1663d34194fc0ed0833
parent 40b5a52b49d40d1dcc1283ff769a774058009144
parent 0c000c879a5ba018971f05fedb6bf7165c3b908f
author TreeHugger Robot <treehugger-gerrit@google.com> 1664157410 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1664157410 +0000

Merge "[RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied" into sc-dev am: 0c000c879a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19949706

Change-Id: Ib156105e456ba1c7e5542a0261f532de3a490322
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>