Merge changes from topic 'ipsec-api-tweaks-merge' into oc-dev

author Nathan Harold <nharold@google.com>

Fri, 14 Apr 2017 20:21:13 +0000 (20:21 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Fri, 14 Apr 2017 20:21:17 +0000 (20:21 +0000)
author Nathan Harold <nharold@google.com>
Fri, 14 Apr 2017 20:21:13 +0000 (20:21 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 14 Apr 2017 20:21:17 +0000 (20:21 +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	Nathan Harold <nharold@google.com>
	Fri, 14 Apr 2017 20:21:13 +0000 (20:21 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 14 Apr 2017 20:21:17 +0000 (20:21 +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