Merge "Hide IpSecManager, IpSecTransform, and IpSecAlgorithm" into oc-dev

author Nathan Harold <nharold@google.com>

Wed, 26 Apr 2017 18:02:49 +0000 (18:02 +0000)

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

Wed, 26 Apr 2017 18:03:00 +0000 (18:03 +0000)
author Nathan Harold <nharold@google.com>
Wed, 26 Apr 2017 18:02:49 +0000 (18:02 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 26 Apr 2017 18:03:00 +0000 (18: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
diff --cc core/java/android/content/Context.java
Simple merge
author	Nathan Harold <nharold@google.com>
	Wed, 26 Apr 2017 18:02:49 +0000 (18:02 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 26 Apr 2017 18:03:00 +0000 (18: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
core/java/android/content/Context.java	patch \|	diff1 \|	diff2 \|	blob \| history