[automerger skipped] [automerge] [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied 2p: 7af50c4d5f am: eb63c835cd -s ours am: f8d17119c3 -s ours am: 338aac3852 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19949706 Change-Id: Ibfcf92c35edeb03f95955d8dcc5b2ca8c11fce5f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: