commit | bda57bb894193a7b5df43381f357fa3c74f0e141 | [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 | 02cbf8421d6b998bf76e2b5b75cde48fc7904f41 | |
parent | 3ff0b457b89897401002f4cff1eb26c5abaeba40 [diff] | |
parent | 604ce95c0e6f8c3e136096253761d797f922ef02 [diff] |
am 0324bb1a: am 23188c2b: Merge "Restore jankless transition keyguard-to-wallpaper" into klp-dev * commit '0324bb1a9972ec766b65d4b47b9688588633967b': Restore jankless transition keyguard-to-wallpaper