Automerger Merge Worker b256f4d348 Merge "Make NattKeepalivePacketData @SystemApi" am: 3516f5853a am: 7522764e59 ...

Change-Id: If93d5bacd85fa5209f3fbb55d1cf0af1231e605d

2020-01-14 15:18:43 +00:00

..

java

Merge "Make NattKeepalivePacketData @SystemApi" am: 3516f5853a am: 7522764e59

2020-01-14 15:18:43 +00:00

jni

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

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

proto

[DO NOT MERGE] Add country blacklist support am: 97dad931df

2019-12-16 21:54:20 +00:00

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

Add minOccurs="0"

2019-12-20 16:54:52 +09:00

TEST_MAPPING

…