| commit | c81a5d632172721f71267f521f0d3e6dc3ae7e43 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Wed Feb 27 21:35:18 2013 -0800 |
| committer | Jim Miller <jaggies@google.com> | Wed Mar 20 17:26:53 2013 -0700 |
| tree | 2661c504c80c4ec96219c478b7febdee4099a43b | |
| parent | 3be79f328a9b8817859679d6c39a509e897db845 [diff] |
Fix bad merge in KeyguardHostView This restores the fix detailed in Change-Id: I866d4b42493df3a6449d8eabc3ea140dc39dac57 Change-Id: Ibe75afd7a612cf96a56e5815a198c2047c7ff5bd