Wu Ahan ef28d3135e Merge "Mark CUJ_NOTIFICATION_SHADE_EXPAND_COLLAPSE_LOCK as deprecated CUJ" into tm-qpr-dev am: 699f5e9471 ...

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

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

2022-08-03 16:09:59 +00:00

..

api

Merge "Sending TaskFragmentInfo and operation type in #onTaskFragmentError" into tm-qpr-dev am: 8be2f81086

2022-07-28 06:11:40 +00:00

java

Merge "Mark CUJ_NOTIFICATION_SHADE_EXPAND_COLLAPSE_LOCK as deprecated CUJ" into tm-qpr-dev am: 699f5e9471

2022-08-03 16:09:59 +00:00

jni

Merge "Merge "Log the errno if calling fork() fails" am: d84afeb673 am: 9bd0d906b4 am: 974e62c820" into tm-d1-dev-plus-aosp am: 22a56f7577

2022-08-01 20:25:51 +00:00

proto

Merge "Add dock charging state into stay awake feature (2/2)" into tm-qpr-dev am: db8dacec8a

2022-07-26 16:37:11 +00:00

res

Merge "Fix generic wrong strings to comply with the UX guideline" into tm-qpr-dev am: 0bc5eed6fa

2022-08-02 23:19:51 +00:00

sysprop

…

tests

Merge "Use PushFilePreparer to push files in OverlayDeviceTests" am: 1c6932c66e am: 2e10f3d671 am: 07578a561b am: 456efe5b27

2022-08-03 02:15:36 +00:00

xsd

…

TEST_MAPPING

…