OSDN Git Service

am f78995a8: am eeef4416: am 6dcf4214: resolved conflicts for merge of 0da4f158 to...
authorRaphael <raphael@google.com>
Mon, 16 Nov 2009 22:47:31 +0000 (14:47 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 16 Nov 2009 22:47:31 +0000 (14:47 -0800)
commitffdb4640741bdd3fd432b70c95052c9f49378470
tree7b32f00cfcb85228a350d079b182729c35e2a305
parent2337c8de13a8023fba8724c97ab076afbf8764a0
parentb0c565b32d9a95a90e4151353390ee2b48b747d4
am f78995a8: am eeef4416: am 6dcf4214: resolved conflicts for merge of 0da4f158 to eclair

Merge commit 'f78995a8eeb0006eba2d431c379e28aeac0b8b5b'

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