Shan Huang df9354d454 Merge "Add missing @Test annotation to ignoresGesture_transitionInProgress" into tm-dev am: 308f9bfa58 am: 9dd284ba1e am: 4ffa0e7214 ...

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

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

2022-05-18 21:05:31 +00:00

..

proto

…

res

Import translations. DO NOT MERGE ANYWHERE

2022-05-08 09:44:49 +00:00

src/com/android/wm/shell

Merge "Fix broken animation on two consecutive swipes." into tm-dev am: 8a91edd4a3 am: ff20854f60 am: a1936419b2

2022-05-18 20:59:54 +00:00

tests

Merge "Add missing @Test annotation to ignoresGesture_transitionInProgress" into tm-dev am: 308f9bfa58 am: 9dd284ba1e am: 4ffa0e7214

2022-05-18 21:05:31 +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

…