| commit | eeef441637736156e7899ddf2de8ddb7cb197cc9 | [log] [tgz] |
|---|---|---|
| author | Raphael <raphael@google.com> | Mon Nov 16 13:18:41 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 16 13:18:41 2009 -0800 |
| tree | 2f04d23df689c11296648ac0f0ec4203c4116e81 | |
| parent | dd138bf16096156754a0d3d7c94c3800bbc046d6 [diff] | |
| parent | 6dcf42149b183e2a2a062c90d60a2803cf01523a [diff] |
am 6dcf4214: resolved conflicts for merge of 0da4f158 to eclair Merge commit '6dcf42149b183e2a2a062c90d60a2803cf01523a' into eclair-mr2 * commit '6dcf42149b183e2a2a062c90d60a2803cf01523a': SDK Manager: phase 1 of support for future schemas