| commit | 427dcdffc2a61c2eb2760337771be05d14beb0a1 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Fri Nov 15 15:26:03 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 15 15:26:03 2013 -0800 |
| tree | 476eeb232246dcf0c39b5689dea8717c6c3e9fde | |
| parent | 1e5af1bcfa3d6d3047a1b60b7abfeab6f3e9d81a [diff] | |
| parent | 0324bb1a9972ec766b65d4b47b9688588633967b [diff] |
am 0324bb1a: am 23188c2b: Merge "Restore jankless transition keyguard-to-wallpaper" into klp-dev * commit '0324bb1a9972ec766b65d4b47b9688588633967b': Restore jankless transition keyguard-to-wallpaper