commit | a6eaf8b38a21bda59ac202093a7dc926cd31f3a3 | [log] [tgz] |
---|---|---|
author | Jorim Jaggi <jjaggi@google.com> | Tue Nov 25 17:38:26 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 25 17:38:26 2014 +0000 |
tree | 385be6519c4cdbf5535a4f3272abf371d8e7f904 | |
parent | dd8de0a7b668bce9193acae290e30e118ec98c69 [diff] | |
parent | 82bb648b5a1a5a4a0946a252a9cf9b6f8944a15d [diff] |
am 82bb648b: am 6b770744: Merge "Fix quick settings on Keyguard" into lmp-mr1-dev * commit '82bb648b5a1a5a4a0946a252a9cf9b6f8944a15d': Fix quick settings on Keyguard