Merge "Make android.intent.action.MASTER_CLEAR depreciation explicit" into oc-dev...

author Vikas Marwaha <vikasmarwaha@google.com>

Fri, 14 Apr 2017 18:36:10 +0000 (18:36 +0000)

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

Fri, 14 Apr 2017 18:36:10 +0000 (18:36 +0000)
author Vikas Marwaha <vikasmarwaha@google.com>
Fri, 14 Apr 2017 18:36:10 +0000 (18:36 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 14 Apr 2017 18:36:10 +0000 (18:36 +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	Vikas Marwaha <vikasmarwaha@google.com>
	Fri, 14 Apr 2017 18:36:10 +0000 (18:36 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 14 Apr 2017 18:36:10 +0000 (18:36 +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