tree 323d4df1544f7de603c8f1663d34194fc0ed0833
parent 3e91dc1fb9244f8bd34608ca96cb8ca77adcc31d
parent 7de60a54671a81b1d8e93fce890dc6dbdeef9b64
author Jeff Chang <chengjeff@google.com> 1664161431 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1664161431 +0000

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied" into rvc-dev am: d667038512 am: 86138c26fd -s ours am: 7de60a5467 -s ours

am skip reason: subject contains skip directive

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

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