Etienne Ruffieux 7f494cc901 Merge "Making Process.NFC_UID SystemApi for modules" am: 06580338e6 am: d086e8ee72 am: 0fcd2ed905 am: 26f9b5d78b ...

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

Change-Id: Ia7695f25f9bec9cd61c1743888cb8c8dd3b8ee04

2022-01-21 00:19:54 +00:00

..

api

Merge "Making Process.NFC_UID SystemApi for modules" am: 06580338e6 am: d086e8ee72 am: 0fcd2ed905 am: 26f9b5d78b

2022-01-21 00:19:54 +00:00

java

Merge "Making Process.NFC_UID SystemApi for modules" am: 06580338e6 am: d086e8ee72 am: 0fcd2ed905 am: 26f9b5d78b

2022-01-21 00:19:54 +00:00

jni

Merge "audio: add Ultrasound input source and content_type"

2022-01-20 06:16:16 +00:00

proto

Merge "[MS64] Remove subscriberId and NetworkId in proto" am: 0433d02aa5 am: 8b1a30dc9e am: 2da7ae49e7 am: e3f20e0d4f

2022-01-20 06:09:54 +00:00

res

Merge changes Ib35908b6,Ic27efba4

2022-01-20 22:03:55 +00:00

sysprop

…

tests

Merge "Attribution of Bluetooth power per process state"

2022-01-21 00:01:02 +00:00

xsd

…

TEST_MAPPING

…