commit | 98b9221a903796aab9615526105a51b4386a078c | [log] [tgz] |
---|---|---|
author | Jim Miller <jaggies@google.com> | Thu May 24 18:48:02 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 24 18:48:02 2012 -0700 |
tree | 02e61f5da229f6232e712ffd4164bc65d545b11b | |
parent | b3db8dc9f1c164dedd7282f8d6e392641e4e8cc9 [diff] | |
parent | c7f82cc7fd2b747284da692f73ea7f09b0db9099 [diff] |
am c7f82cc7: Merge "Fix 6535413: Fix overlapping controls in keyguard" into jb-dev * commit 'c7f82cc7fd2b747284da692f73ea7f09b0db9099': Fix 6535413: Fix overlapping controls in keyguard