Merge "media: Update ImageReader to remove MaxImagesAcquiredException" into klp-dev

author Igor Murashkin <iam@google.com>

Mon, 16 Sep 2013 21:02:32 +0000 (21:02 +0000)

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

Mon, 16 Sep 2013 21:02:32 +0000 (21:02 +0000)
author Igor Murashkin <iam@google.com>
Mon, 16 Sep 2013 21:02:32 +0000 (21:02 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 16 Sep 2013 21:02:32 +0000 (21:02 +0000)
diff --cc api/current.txt
Simple merge
diff --cc media/jni/android_media_ImageReader.cpp
Simple merge
author	Igor Murashkin <iam@google.com>
	Mon, 16 Sep 2013 21:02:32 +0000 (21:02 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 16 Sep 2013 21:02:32 +0000 (21:02 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
media/jni/android_media_ImageReader.cpp	patch \|	diff1 \|	diff2 \|	blob \| history