tree 3ac604304c906ee43d172dd4c95f095f25a173ae
parent f005d55fb76902a09bede226887313c14b806753
parent 2d48a93fea89cbdaae8e6cb718dbc382e35764df
author Jorim Jaggi <jjaggi@google.com> 1443118857 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443118857 +0000

am 2d48a93f: am 98a8c7c5: am e1de9f67: Fix black Keyguard

* commit '2d48a93fea89cbdaae8e6cb718dbc382e35764df':
  Fix black Keyguard