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