am c2eaee53: (-s ours) am a476eed6: Merge "getDuration can be only called after prepared. DO NOT MERGE" into ics-mr1

Browse Source

* commit 'c2eaee533fe25cd9a0781f349e9c8c7ef02bd648':
  getDuration can be only called after prepared. DO NOT MERGE

...

This commit is contained in:

Bart Sears 2012-01-06 15:49:26 -08:00 committed by Android Git Automerger

parent 087876ffa4 fd76796d29

commit 79efd563cc

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available