| commit | 604ce95c0e6f8c3e136096253761d797f922ef02 | [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 | ef1562bc585184a187458c3cdffa3fce273ee8c5 | |
| parent | e39a89bab4d27eb89cc35d1209479dbba6dee3d0 [diff] | |
| parent | e179c18c8d5c2fb102a44619d9c3190a9326952a [diff] |
am 23188c2b: Merge "Restore jankless transition keyguard-to-wallpaper" into klp-dev * commit '23188c2be4abb23f506b01ccd99884debd09cbb6': Restore jankless transition keyguard-to-wallpaper