Ryan Mitchell a1cb15f54e Merge changes from topic "inc-dis" into sc-dev am: 488522c9c5 ...

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

Change-Id: I5ae5007659172d8a247b8613646d72a68a7dd06a

2021-05-28 02:49:33 +00:00

..

api

Merge "Revert "Add user privacy sensitivity APIs."" into sc-dev

2021-05-27 11:59:21 +00:00

java

Merge changes from topic "inc-dis" into sc-dev am: 488522c9c5

2021-05-28 02:49:33 +00:00

jni

Merge "Revert "Reset stack guard after fork from Zygote"" am: d64305cc30 am: aa43978533

2021-05-27 20:33:59 +00:00

proto

Merge "Updates OWNERS files" into sc-dev

2021-05-24 18:30:19 +00:00

res

Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev

2021-05-27 19:18:32 +00:00

sysprop

…

tests

Merge "Fix system service power calculation when measured energy is available" into sc-dev am: 16d1188b7d

2021-05-26 20:59:24 +00:00

xsd

Update location bypass allowlist

2021-05-21 09:25:47 -07:00

TEST_MAPPING

…