tree 2f04d23df689c11296648ac0f0ec4203c4116e81
parent dd138bf16096156754a0d3d7c94c3800bbc046d6
parent 6dcf42149b183e2a2a062c90d60a2803cf01523a
author Raphael <raphael@google.com> 1258406321 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258406321 -0800

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