| commit | 15c3fd31abdc6b318ea491a23ce1e4c3a6f229a8 | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Wed Jun 04 20:05:01 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 04 20:05:01 2014 +0000 |
| tree | ece236609cb0e25b0cfeca4fbc8d008588b8bc1f | |
| parent | b4df2f586ad7b5a0387489401de0c83203610ba9 [diff] | |
| parent | 8988dbb6dff983c986aa0cc1c05b4aaf8c730bbf [diff] |
am 35cfe4c1: Merge "Go back to keyguard when in SHADE_LOCKED with single tap." into lmp-preview-dev * commit '35cfe4c1f216f477d2c024d53a6f2c1a0d817f53': Go back to keyguard when in SHADE_LOCKED with single tap.