OSDN Git Service

Merge remote branch 'goog/ics-mr0' into ics-mr1
authorEd Heyl <ed@google.com>
Tue, 25 Oct 2011 19:50:44 +0000 (19:50 +0000)
committerEd Heyl <ed@google.com>
Tue, 25 Oct 2011 19:50:44 +0000 (19:50 +0000)
commit9a371a201366ff0c0c132a31029a6c2357400b3e
tree774bc4ce54fa5a335b74703dd1262597c2c0ebc0
parent48188464995a57c381f52f270d818496c8879092
parentba6d04f523bf6c3c2d4ed6975109e72f328889b8
Merge remote branch 'goog/ics-mr0' into ics-mr1
wilhelm/src/android/android_GenericMediaPlayer.cpp