Joe Huang 53b4bf9101 Merge "SatellitePvt API council review" into sc-dev am: 9d78bec9fa am: f1f5785e94 ...

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

Change-Id: I885f355bbd4d718d255c3f285eeaf3f779c307c6

2021-05-22 05:02:54 +00:00

..

api

Merge "SatellitePvt API council review" into sc-dev am: 9d78bec9fa am: f1f5785e94

2021-05-22 05:02:54 +00:00

java

Merge "Update location bypass allowlist" into sc-dev am: 20b934e7db am: 54d0f31169

2021-05-22 05:01:15 +00:00

jni

Merge "DngCreator : Add support for maximum resolution mode captures for ultra high resolution sensors." into sc-dev

2021-05-21 17:06:41 +00:00

proto

Merge changes I57f018e4,Ib1e92278 into sc-dev am: 16cd6bb81f am: f9742d8153

2021-05-21 22:34:55 +00:00

res

Merge "Update Face Unlock strings to the latest versions" into sc-dev am: 53e5b2d923 am: 96e071cde4

2021-05-22 00:09:23 +00:00

sysprop

…

tests

Merge "Update location bypass allowlist" into sc-dev am: 20b934e7db am: 54d0f31169

2021-05-22 05:01:15 +00:00

xsd

Update location bypass allowlist

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

TEST_MAPPING

…