OSDN Git Service

Merge "Fix invalid Keyguard state with encrypted devices." into lmp-preview-dev
authorJorim Jaggi <jjaggi@google.com>
Tue, 3 Jun 2014 20:42:18 +0000 (20:42 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 3 Jun 2014 20:42:19 +0000 (20:42 +0000)
commit959ab56ba22fc1c27ae383f4e6d15f5015c5b929
treededff5b4c956863ca8a858bdc5931bd8cfe2501e
parentaaa58d1c4abc63a78809a153cf80c2cb525ba2c2
parentb9d6079120747205e2ae18162aa730fad3b58d9c
Merge "Fix invalid Keyguard state with encrypted devices." into lmp-preview-dev