Sally Yuen fac7ee13de Merge "Follow up Androidx dynamic animation api change" into tm-dev-plus-aosp am: a947f2181d am: 5ca1959f53 ...

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

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

2022-04-29 20:39:14 +00:00

..

proto

…

res

Merge "Set the correct size to the container of icon view" into tm-dev am: 6efe0b12b5 am: 24263521f9 am: 49a1c3544e

2022-04-28 05:20:09 +00:00

src/com/android/wm/shell

Merge "Follow up Androidx dynamic animation api change" into tm-dev-plus-aosp am: a947f2181d am: 5ca1959f53

2022-04-29 20:39:14 +00:00

tests

Merge "Merge "Skip running app pair flicker tests since it's deprecated" into tm-dev am: 535fbd5b46 am: 4bfa1e6aab" into tm-d1-dev-plus-aosp am: 4af27eb298

2022-04-29 19:38:45 +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

…