commit | 1d500220014811b010671382a4669b93ec3dbaf3 | [log] [tgz] |
---|---|---|
author | Jim Miller <jaggies@google.com> | Tue Oct 09 15:17:57 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 09 15:17:57 2012 -0700 |
tree | 89d6b323f8e56a5f7e0a82c0ee883589794dcf18 | |
parent | 8f02205740e0522feb49ffdd88db86985f10799c [diff] | |
parent | af5a45a771f36c3ed6572c27d026818e1d8d1255 [diff] |
am af5a45a7: am 74bc9b68: Merge "Implement music and user priority scheme in keyguard" into jb-mr1-dev * commit 'af5a45a771f36c3ed6572c27d026818e1d8d1255': Implement music and user priority scheme in keyguard