Vinit Nayak daa7236642 Merge "Revert "Revert "Remove check for preventing re-parenting non-spl..."" into tm-dev am: 0567c3553a am: 543a5293cc ...

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17944716

Change-Id: Ifaa063e1b53b979e89c379513e8e05418bfa6c92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2022-05-03 20:13:25 +00:00

..

proto

…

res

Merge changes from topics "presubmit-am-5a31146ec7864d04ab14351725610831", "presubmit-am-bcec5630c20a4c7ca37a5694c6a3b126" into tm-dev am: a512a9b955 am: 6315c81ded am: 6a7226ae03 am: 0d3c6e6d93

2022-05-02 13:09:45 +00:00

src/com/android/wm/shell

Merge "Revert "Revert "Remove check for preventing re-parenting non-spl..."" into tm-dev am: 0567c3553a am: 543a5293cc

2022-05-03 20:13:25 +00:00

tests

Merge "Fix PipTaskOrganizerTest" into tm-dev am: fe8cf73739 am: 62b0c09d47

2022-05-03 19:20:06 +00:00

Android.bp

Merge "Add kotlin-annotations to WindowManager-Shell" am: b8e11a0afd am: 21b19f0f4f am: 3ba75e7300

2022-03-29 15:30:07 +00:00

AndroidManifest.xml

…