[automerger skipped] Merge "[RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied" into sc-dev am: 0c000c879a am: e564f6aff0 -s ours am: 7b67b30d50 -s ours am: 61ad1f294b -s ours

am skip reason: subject contains skip directive

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

Change-Id: I002c0989fa965d378bdce2d0ccae428ff8b2713c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-02-23 23:45:58 +00:00
committed by Automerger Merge Worker

Diff Content Not Available