| commit | a2546bec99ead29357bd8781a444186d42c4cd02 | [log] [tgz] |
|---|---|---|
| author | Jeff Chang <chengjeff@google.com> | Wed Mar 01 11:19:53 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 01 11:19:53 2023 +0000 |
| tree | a46fdf9a89c640aa55b22d47ea705d840c89c8b6 | |
| parent | 1d9a26edb1fb5c1410657c1a63fc045d9b8e3cbe [diff] | |
| parent | 0cc0ac2d9ed498738f2358ef6c4b0a85a8ed6bd1 [diff] |
[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: 3b7929f298 -s ours am: ce6f1842e2 -s ours am: 359ccf7ac9 -s ours am: 515ff45688 -s ours am: 0cc0ac2d9e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19947761 Change-Id: I7defed0d973aa7f0902da48a12af46787d9904e4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>