OSDN Git Service

am 6dcf4214: resolved conflicts for merge of 0da4f158 to eclair
authorRaphael <raphael@google.com>
Mon, 16 Nov 2009 21:18:41 +0000 (13:18 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 16 Nov 2009 21:18:41 +0000 (13:18 -0800)
commit44d4ec4b8ee51b3493f67f5dcf66fd187233c247
tree582b0c0f2a7af6db8cdb4d6c37131a78b9741a2a
parentae9317a64fdb715e03823366e0c39e7b5b59f27d
parentd422b4ed7ab910d42071d04e09d2565b470c2c52
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