Merge "Add new extra for identifying an intent coming from storage UI." into oc-dev...

author Dianne Hackborn <hackbod@google.com>

Fri, 14 Apr 2017 16:48:32 +0000 (16:48 +0000)

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

Fri, 14 Apr 2017 16:48:32 +0000 (16:48 +0000)
author Dianne Hackborn <hackbod@google.com>
Fri, 14 Apr 2017 16:48:32 +0000 (16:48 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 14 Apr 2017 16:48:32 +0000 (16:48 +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/Intent.java
Simple merge
author	Dianne Hackborn <hackbod@google.com>
	Fri, 14 Apr 2017 16:48:32 +0000 (16:48 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 14 Apr 2017 16:48:32 +0000 (16:48 +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/Intent.java	patch \|	diff1 \|	diff2 \|	blob \| history