| commit | 061b4fae3daf40c90b46e16b12e7f22142eb498c | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Thu Nov 08 15:47:04 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 15:47:04 2012 -0800 |
| tree | 152e92dd48a0043fae26e6bc18e524f847f3d617 | |
| parent | 70eeec5c06db3bf38e94d95a284d393e79bf87a0 [diff] | |
| parent | a2bf6181dfca0f93461fc041f2bd2444551a4515 [diff] |
am a2bf6181: am 2c29deaa: am 6be441c5: Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev * commit 'a2bf6181dfca0f93461fc041f2bd2444551a4515': Add mechanism to kick keyguard to show the assistant