tree 3af970f5749519814ecfd5ea7e441c7581d2359a
parent 2222a508e7a1ae963ac1891c555f9add10e571af
parent 6f29590e9a1edabb503eb2089dfcf523bfa563e4
author Craig Mautner <cmautner@google.com> 1381553682 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1381553682 +0000

Merge "Test for hidden keyguard before waiting for it." into klp-dev