Benedict Wong c7ce11cd64 Merge changes I61c84693,I929428f7 am: e6b79e2923 am: d00c6818dd am: 83bdc37516 ...

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

Change-Id: Iaa43c34d7e80328dd17db09332dff98e227223be

2022-01-14 17:59:06 +00:00

..

api

Merge changes I61c84693,I929428f7 am: e6b79e2923 am: d00c6818dd am: 83bdc37516

2022-01-14 17:59:06 +00:00

java

Merge changes I61c84693,I929428f7 am: e6b79e2923 am: d00c6818dd am: 83bdc37516

2022-01-14 17:59:06 +00:00

jni

Merge changes I4753cae7,Ic6554d9b am: d752b7b746 am: 4a14072d74 am: 11e76f17a2

2022-01-13 10:24:44 +00:00

proto

Merge "Add missing vibrator owners files" am: d1d70cfacd am: 4e77275f8f am: a1aa79aa44

2022-01-10 15:18:32 +00:00

res

DO NOT MERGE Revert "[2/n] Camera Compat UI: Add interfaces for client-server..." am: 7617679a61

2022-01-13 22:55:51 +00:00

sysprop

…

tests

Merge "[DU03]Remove INetworkStatsService from BatteryStatsImpl" am: 296fbccd6e am: 33695e7a4f am: 95d57bdc9d

2022-01-12 20:25:58 +00:00

xsd

…

TEST_MAPPING

…