| commit | 0324bb1a9972ec766b65d4b47b9688588633967b | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Fri Nov 15 15:20:18 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 15 15:20:18 2013 -0800 |
| tree | cbb2aaf2d82f9824a8d8a8555a8c01dfa6d2c2f1 | |
| parent | 0037930bbea46ee9a818ff8e66bf7f334e467420 [diff] | |
| parent | 23188c2be4abb23f506b01ccd99884debd09cbb6 [diff] |
am 23188c2b: Merge "Restore jankless transition keyguard-to-wallpaper" into klp-dev * commit '23188c2be4abb23f506b01ccd99884debd09cbb6': Restore jankless transition keyguard-to-wallpaper