Commits
Jim Miller authored and Android Git Automerger committed 08763af07e9M
am 8f1b2e0b: am 00553835: Merge "Attempt to fix NPE in keyguard" into jb-mr2-dev * commit '8f1b2e0b7fdb1de3537fe3f45ba634fb74a94b4e': Attempt to fix NPE in keyguard
Showing diff tofee8cd75823