[automerger skipped] [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied am: 7da08c6bd3 am: ef00451cc5 -s ours am: 42815bea3f -s ours am: 56583f05c0 -s ours am: 7f71ff7d93 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19947761 Change-Id: Ic17acae7cbb271ead4831b54a54a26b5f7c27027 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: