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)
commit5567c486c5a718ad043d4e98d06b972b4d19caf9
tree1cde858eed9a195e2fbdf7a0194d12c873c5f2d1
parent1209de17266f6f950fbf5096e81b91a3e9f71654
parent19c902fc1f841d308782ce48e41de82c6e064781
am 01d2087c: resolved conflicts for merge of 19cb54ea to eclair

Merge commit '01d2087c87627df5bfc7e684f62466e0a662197a' into eclair-mr2

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