tree 6034dbb8847e9ecc938ee4504ac17a0c16ebc3f8
parent b11b9fc9972ba0ae7f3d13984c5c61a8d89ca142
parent ff2aa0bc8919c247bfc8e81d3f168e5064f52ffb
author Jim Miller <jaggies@google.com> 1347491781 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1347491781 -0700

Merge "Initial pass at adding Music control to new keyguard." into jb-mr1-dev