tree 6a858e38d7c077b3fa5bd1a528c7573f593c13dc
parent c9ffd74659fac6f30f3f4653586af2069b903899
parent cc747ad2da3e6e0ebf97dff3a0a65964319af583
author Jim Miller <jaggies@google.com> 1383864776 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1383864777 +0000

Merge "Fix scrubbing behavior on keyguard music transport" into klp-dev