| commit | 93c736b3daa9b715814dd20892c1f41b5348f575 | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Mon Dec 15 22:35:56 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 15 22:35:56 2014 +0000 |
| tree | a59ff58ef2c533301076c37dc3e9a0b7a623ecce | |
| parent | 2fab5307d1983b0415b7eeb79779ecaee7b67ea1 [diff] | |
| parent | 613fffcd0f17eecb0231fe24f7abf7936eef8d37 [diff] |
am 613fffcd: Merge "Revert "Revert "Attempt to fix keyguard missing bug""" into lmp-mr1-dev * commit '613fffcd0f17eecb0231fe24f7abf7936eef8d37': Revert "Revert "Attempt to fix keyguard missing bug""