OSDN Git Service

am 01d2087c: resolved conflicts for merge of 19cb54ea to eclair
authorXavier Ducrohet <xav@android.com>
Thu, 19 Nov 2009 01:14:02 +0000 (17:14 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 19 Nov 2009 01:14:02 +0000 (17:14 -0800)
Merge commit '01d2087c87627df5bfc7e684f62466e0a662197a' into eclair-mr2

* commit '01d2087c87627df5bfc7e684f62466e0a662197a':
  Remove components that were moved to sdk.git and update build scripts.


Trivial merge