| commit | 08763af07e9f6f2c9dd0d4b5e73f9c341c628b84 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Fri May 10 03:06:38 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 10 03:06:38 2013 -0700 |
| tree | 96a9aa51ed80326d3be6fbfb4f4bfbdbde87ce15 | |
| parent | fee8cd75823413a28f004d13e1f25a8954ac2900 [diff] | |
| parent | 8f1b2e0b7fdb1de3537fe3f45ba634fb74a94b4e [diff] |
am 8f1b2e0b: am 00553835: Merge "Attempt to fix NPE in keyguard" into jb-mr2-dev * commit '8f1b2e0b7fdb1de3537fe3f45ba634fb74a94b4e': Attempt to fix NPE in keyguard