OSDN Git Service

merge in ics-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Tue, 30 Aug 2011 20:42:46 +0000 (13:42 -0700)
committerThe Android Automerger <android-build@android.com>
Tue, 30 Aug 2011 20:42:46 +0000 (13:42 -0700)
commit9641158ef2bafc1de350218e0ec902f55f664dd3
tree00737e1c8fe6e23c35e00879b0455beb84b38976
parent514166986238c99e32995af204160b9d58805dc6
merge in ics-release history after reset to master
media/libmediaplayerservice/StagefrightPlayer.cpp
media/libmediaplayerservice/nuplayer/NuPlayer.cpp
media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
media/libstagefright/ACodec.cpp
media/libstagefright/AwesomePlayer.cpp
media/libstagefright/include/AwesomePlayer.h
services/audioflinger/AudioFlinger.cpp
services/audioflinger/AudioFlinger.h