Jeff Sharkey 554d83dae9 Merge "Retire preliminary FGS deferral control API" into sc-dev am: 023570d056 am: 11f386e9e8 am: 741c0ca2fe ...

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

Change-Id: Ib60ef0b86d12d7e5656002c38aa1d0d86c9aa230

2021-05-25 14:58:14 +00:00

..

api

Merge "Retire preliminary FGS deferral control API" into sc-dev am: 023570d056 am: 11f386e9e8 am: 741c0ca2fe

2021-05-25 14:58:14 +00:00

java

Merge "Retire preliminary FGS deferral control API" into sc-dev am: 023570d056 am: 11f386e9e8 am: 741c0ca2fe

2021-05-25 14:58:14 +00:00

jni

Merge "Add TunnelModeStateListener in java+jni" into sc-dev am: ee1219ac1d am: cb824953ce am: 809f09f491

2021-05-25 13:25:06 +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"

2021-05-22 08:16:58 +00:00

sysprop

…

tests

Merge "Add TunnelModeStateListener in java+jni" into sc-dev am: ee1219ac1d am: cb824953ce am: 809f09f491

2021-05-25 13:25:06 +00:00

xsd

Update location bypass allowlist

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

TEST_MAPPING

…