[automerger skipped] Merge "Allow activity to be reparent while allowTaskReparenting is applied" into tm-dev am: 7ef756cc75 am: 0460042adb am: 15ff5ab8e5 -s ours

am skip reason: Merged-In I73abb9ec05af95bc14f887ae825a9ada9600f771 with SHA-1 f63ee3bb84 is already in history

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

Change-Id: I69a3f946463a9147489dc37c229e7c66e22ac5de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-09-26 02:15:48 +00:00
committed by Automerger Merge Worker

Diff Content Not Available