tree be6fb7dcb1c88f26bd2681ce1eb90aa8efeee3d8
parent d5cd89049b801e669960890863f1fa7f4a6e61d9
parent f333f5f67a6e2e943123797d8752f946c9a4b399
author Craig Mautner <cmautner@google.com> 1342044900 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1342044900 -0700

Merge "Handle keyguard visibility states separately. DO NOT MERGE" into jb-dev