| commit | 74bb0375a7dfa42a2847936b9f2467f80d2bcab2 | [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 | 0784d17d80f88a0c09f9a2c4f6ecc4047af63cef | |
| parent | fb47bd574d4d382ea089a5209ae8376950339638 [diff] | |
| parent | ee2a8be8b40cfe7f94aaf10e35fc53230b63bef4 [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...