Merge "Add "throws IOException" to MediaCodec factory methods"

author Andy Hung <hunga@google.com>

Tue, 21 Jan 2014 23:03:33 +0000 (23:03 +0000)

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

Tue, 21 Jan 2014 23:03:33 +0000 (23:03 +0000)
author Andy Hung <hunga@google.com>
Tue, 21 Jan 2014 23:03:33 +0000 (23:03 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 21 Jan 2014 23:03:33 +0000 (23:03 +0000)
diff --cc api/current.txt
Simple merge
diff --cc media/java/android/media/MediaCodec.java
Simple merge
author	Andy Hung <hunga@google.com>
	Tue, 21 Jan 2014 23:03:33 +0000 (23:03 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 21 Jan 2014 23:03:33 +0000 (23:03 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
media/java/android/media/MediaCodec.java	patch \|	diff1 \|	diff2 \|	blob \| history