| commit | 3ed328ecb77a55d90c8818a354533c9631b15cf4 | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Mon Apr 07 17:59:18 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Apr 07 17:59:18 2014 +0000 |
| tree | cfe811876de87135ff08c1cfddf6356479f09d1a | |
| parent | 9afbfaf52ef146f8b6585304d85f46f7bd9b009f [diff] | |
| parent | 0bed7f258ba1fffc10f986ee043b769f1fd40ad3 [diff] |
Merge "Always go through bouncer when unlocking" into master-lockscreen-dev