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)
Merge commit 'f78995a8eeb0006eba2d431c379e28aeac0b8b5b'

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


Trivial merge