tree dedff5b4c956863ca8a858bdc5931bd8cfe2501e
parent aaa58d1c4abc63a78809a153cf80c2cb525ba2c2
parent b9d6079120747205e2ae18162aa730fad3b58d9c
author Jorim Jaggi <jjaggi@google.com> 1401828138 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1401828139 +0000

Merge "Fix invalid Keyguard state with encrypted devices." into lmp-preview-dev