| commit | 76371f0f0e7db8b3eaad5db42d9eb41361382087 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Fri Oct 11 21:58:55 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 11 21:58:55 2013 -0700 |
| tree | 3e5d8f4f39f0a5db4c94836621b4da63e1ec4c39 | |
| parent | c2bf92d42a032c9dadd25904a5b0f183585dc024 [diff] | |
| parent | 2c1934d302730bf4dc9190bc600bee180067df3b [diff] |
am 2c1934d3: am 5a783173: Merge "Test for hidden keyguard before waiting for it." into klp-dev * commit '2c1934d302730bf4dc9190bc600bee180067df3b': Test for hidden keyguard before waiting for it.