Merge "MediaCodecList: handle errors gracefully" into lmp-dev

author Lajos Molnar <lajos@google.com>

Tue, 12 Aug 2014 17:05:56 +0000 (17:05 +0000)

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

Tue, 12 Aug 2014 16:54:46 +0000 (16:54 +0000)
author Lajos Molnar <lajos@google.com>
Tue, 12 Aug 2014 17:05:56 +0000 (17:05 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 12 Aug 2014 16:54:46 +0000 (16:54 +0000)
diff --cc include/media/MediaCodecInfo.h
Simple merge
diff --cc media/libmedia/MediaCodecInfo.cpp
Simple merge
author	Lajos Molnar <lajos@google.com>
	Tue, 12 Aug 2014 17:05:56 +0000 (17:05 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 12 Aug 2014 16:54:46 +0000 (16:54 +0000)
		1	2
include/media/MediaCodecInfo.h	patch \|	diff1 \|	diff2 \|	blob \| history
media/libmedia/MediaCodecInfo.cpp	patch \|	diff1 \|	diff2 \|	blob \| history