commit | 74bc9b68510d8e88fb1c806313aad3f35543202b | [log] [tgz] |
---|---|---|
author | Jim Miller <jaggies@google.com> | Tue Oct 09 15:12:43 2012 -0700 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Oct 09 15:12:44 2012 -0700 |
tree | 94217595043eb5379cfcfeaaf43f0541fb3f26b6 | |
parent | f1b246ddfed6757180768eea080b80c1538333f3 [diff] | |
parent | 223ce5c7326f6d13a17ccf2624605bb62864a27a [diff] |
Merge "Implement music and user priority scheme in keyguard" into jb-mr1-dev