Merge "Removing ACTION_CLEAR_PACKAGE intent" into oc-dev am: ef08871d6b

author Matthew Snider <msnider@google.com>

Mon, 1 May 2017 16:55:39 +0000 (16:55 +0000)

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

Mon, 1 May 2017 16:55:39 +0000 (16:55 +0000)
author Matthew Snider <msnider@google.com>
Mon, 1 May 2017 16:55:39 +0000 (16:55 +0000)
committer android-build-merger <android-build-merger@google.com>
Mon, 1 May 2017 16:55:39 +0000 (16:55 +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	Matthew Snider <msnider@google.com>
	Mon, 1 May 2017 16:55:39 +0000 (16:55 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 1 May 2017 16:55:39 +0000 (16:55 +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