Merge changes from topic "re-enable-ipsec"

author nharold <nharold@google.com>

Tue, 26 Sep 2017 22:13:20 +0000 (22:13 +0000)

committer android-build-merger <android-build-merger@google.com>

Tue, 26 Sep 2017 22:13:20 +0000 (22:13 +0000)
author nharold <nharold@google.com>
Tue, 26 Sep 2017 22:13:20 +0000 (22:13 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 26 Sep 2017 22:13:20 +0000 (22:13 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
diff --cc core/java/android/content/Context.java
Simple merge
author	nharold <nharold@google.com>
	Tue, 26 Sep 2017 22:13:20 +0000 (22:13 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 26 Sep 2017 22:13:20 +0000 (22:13 +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
core/java/android/content/Context.java	patch \|	diff1 \|	diff2 \|	blob \| history