| commit | 0e0f30eda06d07d66dd86986718bd9d8240bc8c9 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Fri Dec 12 04:35:00 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 12 04:35:00 2014 +0000 |
| tree | 4823498351617b9f46a7cfc5b4be9db8c4ddcd21 | |
| parent | 30839ce439893a7183f6711abf730c60c87a2b3a [diff] | |
| parent | 69935f9a053a14da8677b5957bf72ad1746ebad8 [diff] |
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