OSDN Git Service

am 00553835: Merge "Attempt to fix NPE in keyguard" into jb-mr2-dev
authorJim Miller <jaggies@google.com>
Fri, 10 May 2013 06:40:30 +0000 (23:40 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 May 2013 06:40:30 +0000 (23:40 -0700)
commit8f1b2e0b7fdb1de3537fe3f45ba634fb74a94b4e
tree9572ec8f6aaaa12eabb7aa8972ca94f82668eb12
parente8c9b39ec976029d3571f8904a3db21d6514ecf6
parent0055383554983842c5d7bab25a981c6eb804a38c
am 00553835: Merge "Attempt to fix NPE in keyguard" into jb-mr2-dev

* commit '0055383554983842c5d7bab25a981c6eb804a38c':
  Attempt to fix NPE in keyguard