Les Lee 638b67a58f Merge "wifi data usage: support to get carrier merged wifi network." am: bef2f5be94 am: debea981d9 ...

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

Change-Id: Ia115b6c8fe536d77071744374f5d42390cc50dbd

2021-04-27 04:13:08 +00:00

..

api

Merge "Add constant values for MPEG-H."

2021-04-23 22:51:55 +00:00

java

Merge "wifi data usage: support to get carrier merged wifi network." am: bef2f5be94 am: debea981d9

2021-04-27 04:13:08 +00:00

jni

Merge "Add constant values for MPEG-H."

2021-04-23 22:51:55 +00:00

proto

Add OWNERS for android/providers

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

res

Import translations. DO NOT MERGE ANYWHERE

2021-04-22 08:42:43 -07:00

sysprop

…

tests

UWB: Add getAdapterState System API

2021-04-25 06:49:42 +00:00

xsd

…

TEST_MAPPING

…