[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: b482a00d3c -s ours am: 5c12244497 -s ours am: 0d97ae791b -s ours am: 04343b6885 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19947761 Change-Id: I46e5c37c0e42a747c00264f04c15293f9ae780fc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: