Merge "Fix issue #37714224: API Review: ACTION_NEW_VIDEO" into oc-dev

author Dianne Hackborn <hackbod@google.com>

Fri, 28 Apr 2017 18:42:20 +0000 (18:42 +0000)

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

Fri, 28 Apr 2017 18:42:20 +0000 (18:42 +0000)
author Dianne Hackborn <hackbod@google.com>
Fri, 28 Apr 2017 18:42:20 +0000 (18:42 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 28 Apr 2017 18:42:20 +0000 (18:42 +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	Dianne Hackborn <hackbod@google.com>
	Fri, 28 Apr 2017 18:42:20 +0000 (18:42 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 28 Apr 2017 18:42:20 +0000 (18:42 +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