Hongwei Wang df15d102f2 Merge "Remove conflict window crop" into tm-dev am: 3fa5b5332b ...

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

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

2022-06-03 03:14:45 +00:00

..

proto

…

res

Import translations. DO NOT MERGE ANYWHERE

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

src/com/android/wm/shell

Remove conflict window crop

2022-06-02 19:19:07 +00:00

tests

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

2022-05-23 19:30:48 +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

…