commit | d45e5f610ca976cf5a56ce12ba18b39497243fe3 | [log] [tgz] |
---|---|---|
author | Jim Miller <jaggies@google.com> | Wed Aug 29 13:57:13 2012 -0700 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Aug 29 13:57:14 2012 -0700 |
tree | 5ffe34c98a827df2a98a0c17c5b11c0be108edc9 | |
parent | 69626dab17f9e059cfa2e8c3ce4ec9aaa5f9853e [diff] | |
parent | 9c7e630e3ffb2aef4a14f0189824dff8dc9095df [diff] |
Merge "Enable new keyguard" into jb-mr1-dev