Commits
Jim Miller authored and Android Git Automerger committed 0e0f30eda06M
am 69935f9a: am 4841a787: Merge "Attempt to fix keyguard missing bug" into lmp-mr1-dev automerge: 0ca6b7f * commit '69935f9a053a14da8677b5957bf72ad1746ebad8': Attempt to fix keyguard missing bug
Showing diff to30839ce4398