Serik Beketayev c869ab40bf Merge "[Mainline Migration] Migrate NetworkUtils" am: a086c295e7 am: c6218f7977 am: 006d043dfe ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id0749108e03d88af0b8c50a36f1a4ca28b9a40ce

2020-12-10 01:05:32 +00:00

..

api

Merge "Introduce new App Ops permission USE_ICC_AUTH_WITH_DEVICE_IDENTIFIER"

2020-12-10 00:59:08 +00:00

java

Merge "[Mainline Migration] Migrate NetworkUtils" am: a086c295e7 am: c6218f7977 am: 006d043dfe

2020-12-10 01:05:32 +00:00

jni

resolve merge conflicts of 358f0d4fc8 to master

2020-12-08 11:01:05 -07:00

proto

Merge "First version of HPJs."

2020-12-03 17:57:15 +00:00

res

Merge "Introduce new App Ops permission USE_ICC_AUTH_WITH_DEVICE_IDENTIFIER"

2020-12-10 00:59:08 +00:00

sysprop

…

tests

resolve merge conflicts of 358f0d4fc8 to master

2020-12-08 11:01:05 -07:00

xsd

…

TEST_MAPPING

…