Merge "API tweaks to PixelCopy and make it public" into nyc-dev

author John Reck <jreck@google.com>

Wed, 27 Apr 2016 14:36:51 +0000 (14:36 +0000)

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

Wed, 27 Apr 2016 14:36:53 +0000 (14:36 +0000)
author John Reck <jreck@google.com>
Wed, 27 Apr 2016 14:36:51 +0000 (14:36 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 27 Apr 2016 14:36:53 +0000 (14: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
author	John Reck <jreck@google.com>
	Wed, 27 Apr 2016 14:36:51 +0000 (14:36 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 27 Apr 2016 14:36:53 +0000 (14: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