| commit | ce8dcdf5361dd5de8c86cf5b0308c71d519f98ca | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Nov 29 11:33:11 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 29 11:33:11 2012 -0800 |
| tree | 9df1f908f5d1d2fa48a3ce80065769b1b94516ee | |
| parent | 37ddc8fc0f78234b5b3b58886113560cdf98aadf [diff] | |
| parent | 031c93df74621dc2149876dc377aedee8930547f [diff] |
am 031c93df: Merge "Bug fix for the MediaPlayer::prepare() api." * commit '031c93df74621dc2149876dc377aedee8930547f': Bug fix for the MediaPlayer::prepare() api.