Shan Huang f0712948d3 Merge "Add missing @Test annotation to ignoresGesture_transitionInProgress" into tm-dev am: 308f9bfa58 am: 8efc556da6 ...

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

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

2022-05-18 21:53:10 +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: 1d57848828

2022-05-18 21:49:44 +00:00

tests

Merge "Add missing @Test annotation to ignoresGesture_transitionInProgress" into tm-dev am: 308f9bfa58 am: 8efc556da6

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

…