OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 May 2010 16:44:36 +0000 (09:44 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 May 2010 16:44:36 +0000 (09:44 -0700)
commit1d628c5d3dd7998b29c339292a2dc391015d0782
treee520df875144c2c0c824d4d5a858a2acc31df566
parent9167ba50e4d7e08e02119d9c4a0f0392296cc3f1
parent75e181b633ec94dde4a5a62d28040289ad645e74
merge from open-source master

Change-Id: I934cf85c4673f9ca3a9549c2074907ad572310f4
media/libmediaplayerservice/MediaPlayerService.cpp