| commit | 6eb50f7ad52687331e55400a161164a62b8ebd52 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Nov 29 11:35:12 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 29 11:35:12 2012 -0800 |
| tree | 18a2f828bb2b20997af83c541402a553ae2c763c | |
| parent | a6c87d18d0edf49ee5fa7c979f9d41b2febe4062 [diff] | |
| parent | 45be8448daafeab8f37cb82cd2219f95bc218a6a [diff] |
am ce8dcdf5: am 031c93df: Merge "Bug fix for the MediaPlayer::prepare() api." * commit 'ce8dcdf5361dd5de8c86cf5b0308c71d519f98ca': Bug fix for the MediaPlayer::prepare() api.