OSDN Git Service

resolved conflicts for merge of a8939e0d to master
authorJames Dong <jdong@google.com>
Thu, 19 May 2011 15:49:09 +0000 (08:49 -0700)
committerJames Dong <jdong@google.com>
Thu, 19 May 2011 15:49:09 +0000 (08:49 -0700)
commitba43d4282c82e55b5a5c01771f028e6266dbc781
treed192cf2a27470f7fd47d606e2dbcaf65308223d9
parent5c3816f2ff3d40136da1e40eec792d8faf0e75dd
parenta8939e0d48c9bdda2e3dcb1b8c55aa23e8b78b40
resolved conflicts for merge of a8939e0d to master

Change-Id: I090479ed09618e1aa3685ca79e16202d9c82f523
media/libstagefright/AwesomePlayer.cpp
media/libstagefright/include/AwesomePlayer.h