| commit | 5a014c4075d9dfed43564174edf937142faa1031 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 26 02:35:08 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 26 02:35:08 2022 +0000 |
| tree | 06270a31b925b9d1bd5bffc29cba65faf82e2088 | |
| parent | c6bf6c5c6a8de9f59198487f9309abfcc0cf5ea6 [diff] | |
| parent | abed609985ab0c59eaada2fcffc692138c69b9d3 [diff] |
[automerger skipped] Merge "Merge "Allow activity to be reparent while allowTaskReparenting is applied" into tm-dev am: 7ef756cc75 am: 31937d2f45" into tm-d1-dev-plus-aosp am: c62a3ddaff -s ours am: abed609985 -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: Iedd084ae0a8008b6c35d42ffa7d81980624e9d1e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>