| commit | 2657d889ea7e60f5d97926dc7720e9780b6796e0 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Wed Dec 07 17:12:43 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 07 17:12:43 2011 -0800 |
| tree | 9d87ecb453169c4ff09f2303a4b72fed29116b24 | |
| parent | 4741163cd719ce88eddf17ebb0a3ffd6a8044fbe [diff] | |
| parent | b259c04d4321536ef9f5cc9b55079d3bd450eef7 [diff] |
am b259c04d: Merge "Merge commit \'eee12419\' into manualmerge" into ics-mr1 * commit 'b259c04d4321536ef9f5cc9b55079d3bd450eef7': DO NOT MERGE. Integrate from MR 1 to fix issue #5366535: Lockscreen...