| commit | 6817136509968d14165c8eba49504a55f04f4259 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Mon Oct 14 10:50:06 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 14 10:50:06 2013 -0700 |
| tree | 8a3af8a51dec220c5b314a043a66513624d4a774 | |
| parent | a200cad2d3eb19fbb2de3d4309b4ad671d5a426e [diff] | |
| parent | 76371f0f0e7db8b3eaad5db42d9eb41361382087 [diff] |
am 76371f0f: am 2c1934d3: am 5a783173: Merge "Test for hidden keyguard before waiting for it." into klp-dev * commit '76371f0f0e7db8b3eaad5db42d9eb41361382087': Test for hidden keyguard before waiting for it.