| commit | cfbdf8d0b5befbb8fcb4c59b5f4ea47a8932b227 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Thu Sep 09 23:17:14 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 09 23:17:14 2010 -0700 |
| tree | 8d34d4e56fa260f533a00d65a9e68ae504951f98 | |
| parent | 84d10ad4294d6da4ce8e434100fc1f130f5a07de [diff] | |
| parent | 8615fdc15146d27cc2d3a8efbe57f0a425b19efb [diff] |
am 8615fdc1: (-s ours) am 506d724c: Merge "DO NOT MERGE. I like\'d ctate\'s change so much I\'m doin it myself!" into gingerbread Merge commit '8615fdc15146d27cc2d3a8efbe57f0a425b19efb' * commit '8615fdc15146d27cc2d3a8efbe57f0a425b19efb': DO NOT MERGE. I like'd ctate's change so much I'm doin it myself!