| commit | 47fef37d8a54a06b79fa175471538eaefa245dc1 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Fri Nov 15 15:31:33 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 15 15:31:33 2013 -0800 |
| tree | 6437ad7105c0c17b83e25efee9f9c2815fe1cd8d | |
| parent | ac21fd91fb9c2c344b69556c4ad96ebda5d5f7f5 [diff] | |
| parent | 427dcdffc2a61c2eb2760337771be05d14beb0a1 [diff] |
am 427dcdff: am 0324bb1a: am 23188c2b: Merge "Restore jankless transition keyguard-to-wallpaper" into klp-dev * commit '427dcdffc2a61c2eb2760337771be05d14beb0a1': Restore jankless transition keyguard-to-wallpaper