OSDN Git Service

am eeef4416: am 6dcf4214: resolved conflicts for merge of 0da4f158 to eclair
authorRaphael <raphael@google.com>
Mon, 16 Nov 2009 22:41:03 +0000 (14:41 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 16 Nov 2009 22:41:03 +0000 (14:41 -0800)
commit83b591578bc2109260454678095cd49593c811e9
tree582b0c0f2a7af6db8cdb4d6c37131a78b9741a2a
parent41ff4d9608112955ed1966a3b2948f92a98346b1
parent44d4ec4b8ee51b3493f67f5dcf66fd187233c247
am eeef4416: am 6dcf4214: resolved conflicts for merge of 0da4f158 to eclair

Merge commit 'eeef441637736156e7899ddf2de8ddb7cb197cc9' into eclair-mr2-plus-aosp

* commit 'eeef441637736156e7899ddf2de8ddb7cb197cc9':
  SDK Manager: phase 1 of support for future schemas