| commit | 623a5572e894c2114767f5631165354076d0b139 | [log] [tgz] |
|---|---|---|
| author | Mike Lockwood <lockwood@android.com> | Mon Dec 07 10:52:22 2009 -0500 |
| committer | Mike Lockwood <lockwood@android.com> | Mon Dec 07 10:52:22 2009 -0500 |
| tree | fb8390f3df34801da2bbf28aa00eb631e4c155f0 | |
| parent | e15968b47a30fb6411a682ac06a5d93ea89011b0 [diff] | |
| parent | 882ad42e0de35d86f2361867e3efc497002b73e6 [diff] |
resolved conflicts for merge of 882ad42e to eclair-mr2 Change-Id: I3d14fd9f6bb2b6f3878e519b29db113c37d64587