Merge "Exposing file:// beyond your app is bad, m'kay?"

author Jeff Sharkey <jsharkey@google.com>

Fri, 29 Jan 2016 02:43:28 +0000 (02:43 +0000)

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

Fri, 29 Jan 2016 02:43:28 +0000 (02:43 +0000)
author Jeff Sharkey <jsharkey@google.com>
Fri, 29 Jan 2016 02:43:28 +0000 (02:43 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 29 Jan 2016 02:43:28 +0000 (02:43 +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	Jeff Sharkey <jsharkey@google.com>
	Fri, 29 Jan 2016 02:43:28 +0000 (02:43 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 29 Jan 2016 02:43:28 +0000 (02:43 +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