Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-dev

author Chong Zhang <chz@google.com>

Mon, 13 Oct 2014 19:48:51 +0000 (19:48 +0000)

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

Mon, 13 Oct 2014 19:48:51 +0000 (19:48 +0000)
author Chong Zhang <chz@google.com>
Mon, 13 Oct 2014 19:48:51 +0000 (19:48 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 13 Oct 2014 19:48:51 +0000 (19:48 +0000)
diff --cc media/libstagefright/ACodec.cpp
Simple merge
author	Chong Zhang <chz@google.com>
	Mon, 13 Oct 2014 19:48:51 +0000 (19:48 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 13 Oct 2014 19:48:51 +0000 (19:48 +0000)