Merge "[audio][nuplayer] Aggregate buffers to reduce power." into lmp-dev

author Phil Burk <philburk@google.com>

Mon, 8 Sep 2014 23:00:40 +0000 (23:00 +0000)

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

Mon, 8 Sep 2014 23:00:40 +0000 (23:00 +0000)
author Phil Burk <philburk@google.com>
Mon, 8 Sep 2014 23:00:40 +0000 (23:00 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 8 Sep 2014 23:00:40 +0000 (23:00 +0000)
diff --cc media/libmediaplayerservice/nuplayer/NuPlayer.cpp
Simple merge
diff --cc media/libmediaplayerservice/nuplayer/NuPlayer.h
Simple merge
author	Phil Burk <philburk@google.com>
	Mon, 8 Sep 2014 23:00:40 +0000 (23:00 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 8 Sep 2014 23:00:40 +0000 (23:00 +0000)
		1	2
media/libmediaplayerservice/nuplayer/NuPlayer.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
media/libmediaplayerservice/nuplayer/NuPlayer.h	patch \|	diff1 \|	diff2 \|	blob \| history