Merge "move ACTION_CARRIER_SETUP intent to public api"

author Chen Xu <fionaxu@google.com>

Sat, 25 Feb 2017 01:05:30 +0000 (01:05 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Sat, 25 Feb 2017 01:05:30 +0000 (01:05 +0000)
author Chen Xu <fionaxu@google.com>
Sat, 25 Feb 2017 01:05:30 +0000 (01:05 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Sat, 25 Feb 2017 01:05:30 +0000 (01:05 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
author	Chen Xu <fionaxu@google.com>
	Sat, 25 Feb 2017 01:05:30 +0000 (01:05 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Sat, 25 Feb 2017 01:05:30 +0000 (01:05 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history