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)
commitf78995a8eeb0006eba2d431c379e28aeac0b8b5b
tree936e545c119d377f2ec850e6c1ce09b74f5e455e
parent237c3bc13181c1fb344a8c21af0417c5f86e26e3
parenteeef441637736156e7899ddf2de8ddb7cb197cc9
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