commit | ce6f1842e21b1b81c4a140e2519c098af5b65f0d | [log] [tgz] |
---|---|---|
author | Jeff Chang <chengjeff@google.com> | Thu Feb 23 23:00:36 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Feb 23 23:00:36 2023 +0000 |
tree | f72082ccc8290c1142a202d2f872bcdc6bd17816 | |
parent | 7f71ff7d9361d054f63ac0757420279c03f0d882 [diff] | |
parent | 3b7929f2988bf6c422acaa907ea099b10946c78d [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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19947761 Change-Id: I189d674b4c0b6983967e5319c559f446e106758d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>