Kholoud Mohamed adea53e413 Merge "Revert "Create non-bypassable op restrictions"" into sc-dev am: b04a005c3f am: 1b75773363 am: f5c59257b2 ...

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

Change-Id: I9a05af77c2d85eebaac58dba9a02bfa6e6a042cb

2021-05-20 11:05:51 +00:00

..

api

Merge "Add user privacy sensitivity APIs." into sc-dev am: c06af26cc0 am: 6046b7c865 am: 9736946594

2021-05-20 05:16:01 +00:00

java

Merge "Revert "Create non-bypassable op restrictions"" into sc-dev am: b04a005c3f am: 1b75773363 am: f5c59257b2

2021-05-20 11:05:51 +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 "Correct AppWidget layout when WP is off" into sc-dev am: 175302bb89 am: 5e7737ad6f am: 9dca664da3

2021-05-20 04:55:09 +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

…