| commit | 3b9de0a429910cd66e5360b279328778bb710083 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Thu Mar 13 19:47:29 2014 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 13 19:47:29 2014 -0700 |
| tree | 07ae00307a80d747dce670622bd11f5179a2470f | |
| parent | 657dbc40427c17cbf31be1a17cf2fa7a4116722a [diff] | |
| parent | 00e12e61472d850c00cf1e479fda2b371ead1257 [diff] |
am 00e12e61: am 1066fc61: Resolved conflicts for merge of ad63d914 to jb-mr2-dev * commit '00e12e61472d850c00cf1e479fda2b371ead1257': Show the keyguard if unsecure window on top