Automerger Merge Worker 968f5a9665 Merge "Expose ConnectivityManager#TYPE_WIFI_P2P as SystemApi" am: dda5e92547 am: fe7146187e ...

Change-Id: Ic2168f237508137de450833d9c4a8f7229d89090

2020-01-15 12:16:25 +00:00

..

java

Merge "Expose ConnectivityManager#TYPE_WIFI_P2P as SystemApi" am: dda5e92547 am: fe7146187e

2020-01-15 12:16:25 +00:00

jni

Merge "Rename sdkext module to sdkextensions" am: e2ca01dbfe am: 465a862e61

2020-01-09 09:19:40 +00:00

proto

…

res

Merge "[Telephony Mainline] Add new SystemApi method and SystemApi annotation for mainline" am: 9f48bdc383 am: ee1e3f4969

2020-01-14 06:41:23 +00:00

tests

Merge changes I978ac321,I5675a80c,I56ef3cc4,I1cdaf002 am: 2ff0a7bd58 am: 3bb4823ce5

2020-01-11 01:17:27 +00:00

xsd

…

TEST_MAPPING

…