commit | 23f0778983b511f7dece86515f59aca251db1053 | [log] [tgz] |
---|---|---|
author | Jorim Jaggi <jjaggi@google.com> | Sat Oct 04 00:11:22 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Oct 04 00:11:22 2014 +0000 |
tree | 9125043d7d527af1d623d469d4695f1307c15002 | |
parent | 850270d5aa1753f7ca6e4fa009a288d10dd526c6 [diff] | |
parent | 3c6300da713a7407a3fcfba126ef912ea7bc21bc [diff] |
am 3c6300da: am eae1c3d5: Merge "Fix blank Keyguard #4" into lmp-dev * commit '3c6300da713a7407a3fcfba126ef912ea7bc21bc': Fix blank Keyguard #4