Merge "Change android.permission.RESTRICTED_VR_ACCESS to SystemAPI" into oc-dev

author Jeff Sharkey <jsharkey@google.com>

Mon, 1 May 2017 15:45:32 +0000 (15:45 +0000)

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

Mon, 1 May 2017 15:45:32 +0000 (15:45 +0000)
author Jeff Sharkey <jsharkey@google.com>
Mon, 1 May 2017 15:45:32 +0000 (15:45 +0000)
committer android-build-merger <android-build-merger@google.com>
Mon, 1 May 2017 15:45:32 +0000 (15:45 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
diff --cc core/res/AndroidManifest.xml
Simple merge
author	Jeff Sharkey <jsharkey@google.com>
	Mon, 1 May 2017 15:45:32 +0000 (15:45 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 1 May 2017 15:45:32 +0000 (15:45 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history