Jack Nudelman 296cec5c58 Merge changes from topics "VOIMS_OPT_IN", "d2d" am: f99f7fce5d ...

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

Change-Id: Iaefd51c1ebe49a81739600c6ef56d5663e54a81d

2021-04-29 20:43:24 +00:00

..

api

Add D2D sharing level setting APIs. am: d5eb6fb0ef

2021-04-29 20:42:32 +00:00

java

Add D2D sharing level setting APIs. am: d5eb6fb0ef

2021-04-29 20:42:32 +00:00

jni

Merge "AndroidRuntime.h: do not include IBinder.h"

2021-04-28 17:29:44 +00:00

proto

Add OWNERS for android/providers

2021-04-22 10:22:55 +01:00

res

Merge "Add a new permission to install testOnly apps" am: 71d89f5d0d

2021-04-29 09:43:10 +00:00

sysprop

…

tests

Merge "Add getters to UnderlyingNetworkInfo"

2021-04-29 07:29:08 +00:00

xsd

…

TEST_MAPPING

…