| commit | 00e12e61472d850c00cf1e479fda2b371ead1257 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Thu Mar 13 19:40:49 2014 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 13 19:40:49 2014 -0700 |
| tree | 6ad06361a295aa0b56ca2a5fa9c4166341552943 | |
| parent | b37768816cd9c530dcbb3a8f51d87536406a975b [diff] | |
| parent | 1066fc61a371443e9423f890f6f7615f2d1e4c6c [diff] |
am 1066fc61: Resolved conflicts for merge of ad63d914 to jb-mr2-dev * commit '1066fc61a371443e9423f890f6f7615f2d1e4c6c': Show the keyguard if unsecure window on top