| commit | 8ed4d5ac664f2442c9fd9d9861abd6d589dac73b | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Wed Jul 23 18:44:53 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jul 23 18:38:23 2014 +0000 |
| tree | be4993f935ab2332f7dc3c9d660ce41240928390 | |
| parent | 3e2bbda757596026c80fe6e08a9987dca8ac6e1d [diff] | |
| parent | 2961ce599ebee4895d2c9720fff7f011e7d4a0cd [diff] |
Merge "Make the 'locked' lock task not lock keyguard on exit" into lmp-dev