OSDN Git Service

Merge "getDuration can be only called after prepared. DO NOT MERGE" into ics-mr1
authorBart Sears <bsears@google.com>
Fri, 6 Jan 2012 23:45:13 +0000 (15:45 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 6 Jan 2012 23:45:13 +0000 (15:45 -0800)
commit4dc1cbe06ffd3f01d9b8e5db141398d33ea47500
tree485b152b97bf8321fdd223f35587bb4294672be8
parent86769336488827f18780f29b093a1d2492d4be10
parent55ec71116fb95ed0b21d570d2f12587a9d60b354
Merge "getDuration can be only called after prepared. DO NOT MERGE" into ics-mr1