Tyler Gunn 4d97d127fd resolve merge conflicts of 37f6620029 to stage-aosp-master ...

Bug: 129531123
Test: I solemnly swear I didn't test this conflict resolution.
Change-Id: I9efdae311353efc40402db6080312d3683330c41

2019-04-04 20:54:37 +00:00

..

current.txt

resolve merge conflicts of 37f6620029 to stage-aosp-master

2019-04-04 20:54:37 +00:00

removed.txt

Remove deprecated entitlement API

2019-03-15 09:03:50 +00:00

system-current.txt

Merge "Fix API in CaptivePortal, StaticIpConfiguration"

2019-04-03 01:21:38 -07:00

system-removed.txt

IWLAN API review changes

2019-03-21 14:12:24 -07:00

TEST_MAPPING

Add TEST_MAPPING for api specifications

2019-02-06 13:57:42 +00:00

test-current.txt

Merge "Fix API in CaptivePortal, StaticIpConfiguration"

2019-04-03 01:21:38 -07:00

test-removed.txt

Update signature files to the new format

2019-01-19 07:22:55 -08:00