| commit | 62f4ce67ac171a2778f9f854fbdd65508d779001 | [log] [tgz] |
|---|---|---|
| author | Evan Millar <emillar@google.com> | Mon Jun 21 12:12:55 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 21 12:12:55 2010 -0700 |
| tree | 96f7d2aa4c5397d2164f19e0adf22532df1d3041 | |
| parent | a6fa26f83fd7361d961eb41ae943f6d704be3369 [diff] | |
| parent | 9afeda0519c4f4892611565d678f01d269863bb8 [diff] |
am 9afeda05: (-s ours) am e47e3f38: Merge "Manual merge of change 53051 from master (DO NOT MERGE)" into gingerbread Merge commit '9afeda0519c4f4892611565d678f01d269863bb8' * commit '9afeda0519c4f4892611565d678f01d269863bb8': Manual merge of change 53051 from master (DO NOT MERGE)