| commit | 0ca6b7f98085c079ccfb4b799fba5f570380a827 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Thu Dec 11 23:41:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 11 23:41:03 2014 +0000 |
| tree | ed7f4d19feaa11d7691ee7a71d304eda789f8126 | |
| parent | b21a7ad02e43900ea5480e796cb1518bd5829e3f [diff] | |
| parent | 4841a787b3380ba045a465e347668729b19f3d79 [diff] |
am 4841a787: Merge "Attempt to fix keyguard missing bug" into lmp-mr1-dev * commit '4841a787b3380ba045a465e347668729b19f3d79': Attempt to fix keyguard missing bug