tree b67596f3dcbc24f361e43bb7891ed3ea70b67d37
parent 4b08df1040b3eeb555ecb7abb8a9df9b5aa5d396
parent 5e2ac67826bdf0b42f4939db773488bfb07ceaa6
author Jim Miller <jaggies@google.com> 1314667844 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1314667844 -0700

Merge "Fix 5044158: Integrate music transport control into LockScreen"