Merge "API to set multiple CA certificates for WifiEnterpriseConfig" into mm-wireless-dev

author Rubin Xu <rubinxu@google.com>

Wed, 27 Jan 2016 00:26:58 +0000 (00:26 +0000)

committer Android Partner Code Review <android-gerrit-partner@google.com>

Wed, 27 Jan 2016 00:26:58 +0000 (00:26 +0000)
author Rubin Xu <rubinxu@google.com>
Wed, 27 Jan 2016 00:26:58 +0000 (00:26 +0000)
committer Android Partner Code Review <android-gerrit-partner@google.com>
Wed, 27 Jan 2016 00:26:58 +0000 (00:26 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
author	Rubin Xu <rubinxu@google.com>
	Wed, 27 Jan 2016 00:26:58 +0000 (00:26 +0000)
committer	Android Partner Code Review <android-gerrit-partner@google.com>
	Wed, 27 Jan 2016 00:26:58 +0000 (00:26 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history