Merge "[AWARE] Update network API: make open/encrypted explicit"

author Etan Cohen <etancohen@google.com>

Fri, 10 Mar 2017 17:03:20 +0000 (17:03 +0000)

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

Fri, 10 Mar 2017 17:03:21 +0000 (17:03 +0000)
author Etan Cohen <etancohen@google.com>
Fri, 10 Mar 2017 17:03:20 +0000 (17:03 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 10 Mar 2017 17:03:21 +0000 (17:03 +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	Etan Cohen <etancohen@google.com>
	Fri, 10 Mar 2017 17:03:20 +0000 (17:03 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Fri, 10 Mar 2017 17:03:21 +0000 (17:03 +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