Nathalie Le Clair 4d59cf2ca4 Merge changes I46fb8cfe,I4181b465,I99e1ca1d,I66b09693 into tm-dev am: 121a209ae9 ...

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

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

2022-03-31 16:54:28 +00:00

..

api

Merge "Add an API to disable/restore doze settings" into tm-dev am: 97c8cee1a3

2022-03-31 06:55:42 +00:00

java

Merge changes I46fb8cfe,I4181b465,I99e1ca1d,I66b09693 into tm-dev am: 121a209ae9

2022-03-31 16:54:28 +00:00

jni

Merge "Add ScopedLocalRef for javaObjectForIBinder" into tm-dev am: 29ffb6bab2

2022-03-30 22:13:45 +00:00

proto

Merge changes from topics "b124224342", "change_procstate_flag" into tm-dev am: 45081ab6a0

2022-03-29 22:11:51 +00:00

res

Merge changes from topic "presubmit-am-0ceaf5de4b364feeaa00d2d1e8e8414b" into tm-dev am: 033ac7f454

2022-03-31 08:54:08 +00:00

sysprop

…

tests

Merge "Fix handling of negative size request for Bitmaps in LocalImageResolver" into tm-dev am: 0c36369480

2022-03-31 11:45:34 +00:00

xsd

…

TEST_MAPPING

…