| commit | 41e0b205c4ac28b2ca583d9de5ea1676786ba882 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Wed Dec 07 17:14:48 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 07 17:14:48 2011 -0800 |
| tree | 75f3f73aabf6a5e0f31620361f93b02d9b57109f | |
| parent | 7776da1b79851d7a794b1ecb5bf990a5161a68c1 [diff] | |
| parent | 2657d889ea7e60f5d97926dc7720e9780b6796e0 [diff] |
am 2657d889: (-s ours) am b259c04d: Merge "Merge commit \'eee12419\' into manualmerge" into ics-mr1 * commit '2657d889ea7e60f5d97926dc7720e9780b6796e0': DO NOT MERGE. Integrate from MR 1 to fix issue #5366535: Lockscreen...