Merge "MediaBuffer: ABuffer will release MediaBuffer when it's destructed." into...

author Wei Jia <wjia@google.com>

Mon, 22 Sep 2014 16:03:02 +0000 (16:03 +0000)

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

Mon, 22 Sep 2014 16:03:03 +0000 (16:03 +0000)
author Wei Jia <wjia@google.com>
Mon, 22 Sep 2014 16:03:02 +0000 (16:03 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 22 Sep 2014 16:03:03 +0000 (16:03 +0000)
diff --cc media/libmediaplayerservice/nuplayer/GenericSource.cpp
Simple merge
diff --cc media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
Simple merge
author	Wei Jia <wjia@google.com>
	Mon, 22 Sep 2014 16:03:02 +0000 (16:03 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 22 Sep 2014 16:03:03 +0000 (16:03 +0000)
		1	2
media/libmediaplayerservice/nuplayer/GenericSource.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp	patch \|	diff1 \|	diff2 \|	blob \| history