| commit | 959ab56ba22fc1c27ae383f4e6d15f5015c5b929 | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Tue Jun 03 20:42:18 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jun 03 20:42:19 2014 +0000 |
| tree | dedff5b4c956863ca8a858bdc5931bd8cfe2501e | |
| parent | aaa58d1c4abc63a78809a153cf80c2cb525ba2c2 [diff] | |
| parent | b9d6079120747205e2ae18162aa730fad3b58d9c [diff] |
Merge "Fix invalid Keyguard state with encrypted devices." into lmp-preview-dev