Shawn Willden bbdb4d9ee5 Merge "Add support for app-generated attestation keys." am: 50a66e39cd am: 2da3a280d2 ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad2f426ed43fdb9b4e62c81902d9f7ff8e936535

2021-02-17 20:14:54 +00:00

..

api

Merge "Add support for app-generated attestation keys." am: 50a66e39cd am: 2da3a280d2

2021-02-17 20:14:54 +00:00

java

Merge "Add support for app-generated attestation keys." am: 50a66e39cd am: 2da3a280d2

2021-02-17 20:14:54 +00:00

jni

Merge "dumpsys: Print total DMA-BUFs exported from the DMA-BUF heaps framework" am: 2a2456d3a4 am: 2d4714ec65

2021-02-16 18:51:21 +00:00

proto

Add a registerSystemDefaultNetworkCallback method.

2021-02-09 20:58:28 +09:00

res

Merge "Add new android.permission.UWB_PRIVILEGED" am: 613b8c890b am: 4aeba8055d

2021-02-17 17:33:54 +00:00

sysprop

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

2021-02-16 04:09:57 -08:00

tests

Merge "Add UCS-2 support for SimPhonebookContract" am: 9a90bb9efa am: 9758ffb187

2021-02-17 08:33:46 +00:00

xsd

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

2021-02-16 04:09:57 -08:00

TEST_MAPPING

…