Winson Chung f2ea5dc79b Merge changes Ie8c5a77b,I96125e9f into tm-qpr-dev am: 4fdf7f46f1 am: 9d9650cac7 ...

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

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

2022-07-20 16:44:01 +00:00

..

proto

…

res

Merge "Import translations. DO NOT MERGE ANYWHERE"

2022-07-17 19:06:04 +00:00

src/com/android/wm/shell

Merge changes Ie8c5a77b,I96125e9f into tm-qpr-dev am: 4fdf7f46f1 am: 9d9650cac7

2022-07-20 16:44:01 +00:00

tests

Merge changes Ie8c5a77b,I96125e9f into tm-qpr-dev am: 4fdf7f46f1 am: 9d9650cac7

2022-07-20 16:44:01 +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

…