| commit | 4800de0f7ce810f57db4259a6f6a7d02484800ea | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Mon Dec 15 22:41:50 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 15 22:41:50 2014 +0000 |
| tree | 74f660f9b68151ad3e2afc66fb7fde6cfd29f60d | |
| parent | 3e8484c3f7f615c4b3f1cb925c4164d513cc0e97 [diff] | |
| parent | 93c736b3daa9b715814dd20892c1f41b5348f575 [diff] |
am 93c736b3: am 613fffcd: Merge "Revert "Revert "Attempt to fix keyguard missing bug""" into lmp-mr1-dev * commit '93c736b3daa9b715814dd20892c1f41b5348f575': Revert "Revert "Attempt to fix keyguard missing bug""