Hongwei Wang 35dab9c89b Merge "Remove conflict window crop" into tm-dev am: 3fa5b5332b am: 94e78c557f ...

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

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

2022-06-03 03:39:59 +00:00

..

proto

…

res

Import translations. DO NOT MERGE ANYWHERE

2022-05-31 14:10:12 -07:00

src/com/android/wm/shell

Merge "Remove conflict window crop" into tm-dev am: 3fa5b5332b am: 94e78c557f

2022-06-03 03:39:59 +00:00

tests

DO NOT MERGE Only rely on developer option for back animation am: ab58191c7f

2022-05-23 19:32:00 +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

…