Mady Mellor 7ea1f2465f Merge "Fix selection after dismissal" into tm-qpr-dev am: 7ce3792d9e am: ce9bde0d73 ...

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

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

2022-06-06 18:28:04 +00:00

..

proto

…

res

Import translations. DO NOT MERGE ANYWHERE

2022-05-31 14:13:33 -07:00

src/com/android/wm/shell

Merge "Fix selection after dismissal" into tm-qpr-dev am: 7ce3792d9e am: ce9bde0d73

2022-06-06 18:28:04 +00:00

tests

Merge "Migrate unfold animation to Shell transitions [Part 3]" into tm-qpr-dev am: cd6eac332c am: 197b57659b

2022-06-06 10:05:03 +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

…