Merge "Fix SoundPool and MediaPlayerService buffer overflow" into lmp-dev

author Andy Hung <hunga@google.com>

Fri, 22 Aug 2014 00:33:24 +0000 (00:33 +0000)

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

Fri, 22 Aug 2014 00:33:24 +0000 (00:33 +0000)
author Andy Hung <hunga@google.com>
Fri, 22 Aug 2014 00:33:24 +0000 (00:33 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 22 Aug 2014 00:33:24 +0000 (00:33 +0000)
diff --cc media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
Simple merge
author	Andy Hung <hunga@google.com>
	Fri, 22 Aug 2014 00:33:24 +0000 (00:33 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 22 Aug 2014 00:33:24 +0000 (00:33 +0000)