| commit | 5eca943b978fbbca904994afeca78a0f2bf34ad5 | [log] [tgz] |
|---|---|---|
| author | Android (Google) Code Review <android-gerrit@google.com> | Wed Nov 11 17:00:23 2009 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Nov 11 17:00:23 2009 -0800 |
| tree | 3da062fcc396979b70df674ed54a91c7b8e4cc7e | |
| parent | f16a6ae9c01ebfea1fdfd529c1b98546f8ba0323 [diff] | |
| parent | 44888afd892686b54d8afdca05a06f999d582d1e [diff] |
Merge change I735f4553 into eclair-mr2 * changes: resolved conflicts for merge of ae0cf6dc to eclair-mr2