| commit | c4be307fbf13f27a5938b84e1b90d6a2a9f53ae2 | [log] [tgz] |
|---|---|---|
| author | Bart Sears <bsears@google.com> | Fri Jan 06 15:51:12 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 06 15:51:12 2012 -0800 |
| tree | 8c9295359a8a618b57b79a27b0cb4793d57d69b4 | |
| parent | 44de65c1f07b788cca41539dcb0b77624cbb2d26 [diff] | |
| parent | 9f0dfcd64a764126359553933fdd6a766f6565d8 [diff] |
am 9f0dfcd6: am c2eaee53: (-s ours) am a476eed6: Merge "getDuration can be only called after prepared. DO NOT MERGE" into ics-mr1 * commit '9f0dfcd64a764126359553933fdd6a766f6565d8': getDuration can be only called after prepared. DO NOT MERGE