tree b900c001dc1fbfea978219dd569a5f865c7fde3c
parent a47f079f4f19dda8e02b525bff439375e235cec7
parent 3e91dc1fb9244f8bd34608ca96cb8ca77adcc31d
author Jeff Chang <chengjeff@google.com> 1664162694 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1664162694 +0000

[automerger skipped] [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied am: 7da08c6bd3 am: ef00451cc5 -s ours am: 42815bea3f -s ours am: 3e91dc1fb9 -s ours

am skip reason: subject contains skip directive

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

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