TreeHugger Robot 63ba4d5720 Merge "Controls - Use new privacy setting" into sc-dev am: 20e75f17e5 am: e4bfa0943e ...

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

Change-Id: I0b3f1d5a945ed72a026c4d827671c0a6d64ffe09

2021-05-20 00:24:12 +00:00

..

api

Merge "speech: Add #isOnDeviceRecognitionAvailable" into sc-dev am: cd145f1b9a am: f2b38b9599

2021-05-20 00:20:57 +00:00

java

Merge "Controls - Use new privacy setting" into sc-dev am: 20e75f17e5 am: e4bfa0943e

2021-05-20 00:24:12 +00:00

jni

Merge "Check mInputEventReceiver before sending timeline -- 2" into sc-dev am: 234adf7cb2 am: 12318a45bd

2021-05-19 23:20:43 +00:00

proto

Merge changes I04dfc5c2,Idc7e1f3c am: 1ef34e9022 am: 4c56bac295

2021-05-18 23:16:02 +00:00

res

Merge "Fix NAS dialog string" into sc-dev am: 9fb97956fd am: fb1663a218

2021-05-20 00:17:08 +00:00

sysprop

…

tests

Merge "Connect ColorStateList to CAM" into sc-dev am: 671019f95c am: 6c72295195

2021-05-20 00:23:41 +00:00

xsd

…

TEST_MAPPING

…