tree d4332853f536a02743f087a717b92ace43222fef
parent fdbbbba4cd4807bed1200f714609d4000501d4ee
parent f0ee5b813597e97123d518b227c555c0ea0c0f29
author Chris Wren <cwren@android.com> 1351313432 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1351313434 -0700

Merge "single unlock target with honycomb semantics" into jb-mr1-lockscreen-dev