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