OSDN Git Service

resolved conflicts for merge of 3d630e86 to master
authorAndreas Huber <andih@google.com>
Wed, 30 Nov 2011 17:53:40 +0000 (09:53 -0800)
committerAndreas Huber <andih@google.com>
Wed, 30 Nov 2011 17:53:40 +0000 (09:53 -0800)
commitea9d51bd710e6739077a3700f27a1c37767a2f6d
treebd2df5e1d9f4f5a95976779aa7f73d7e4989c6c3
parent37a153f450cb8550fe64a1bf62366cf5e944d6ab
parent8a1fac32b307cfa096b343f219d471365b657ad8
resolved conflicts for merge of 3d630e86 to master

Change-Id: I9eb7b7c1668b5f0de85ec8b1e9257cf1ec4d8b9e
media/libmediaplayerservice/nuplayer/NuPlayer.cpp
media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp