| commit | c67d057596d81aea8fcd4868453cfcb501157297 | [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 | 025085be6fcc4ead1be6f033b114d5f8f3f2dde9 | |
| parent | 504dd3fdad2e1f59eb553ea2d4f94235eb7a8472 [diff] | |
| parent | ce8dcdf5361dd5de8c86cf5b0308c71d519f98ca [diff] |
am ce8dcdf5: am 031c93df: Merge "Bug fix for the MediaPlayer::prepare() api." * commit 'ce8dcdf5361dd5de8c86cf5b0308c71d519f98ca': Bug fix for the MediaPlayer::prepare() api.