OSDN Git Service

am 934b8ca5: resolved conflicts for merge of 8915fd90 to eclair-mr2-plus-aosp
authorXavier Ducrohet <xav@android.com>
Thu, 19 Nov 2009 01:58:54 +0000 (17:58 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 19 Nov 2009 01:58:54 +0000 (17:58 -0800)
commit1813e21b6e19caa7bb99922e2d68d7a912ab6b0c
tree1cde858eed9a195e2fbdf7a0194d12c873c5f2d1
parent7302d977a6af7b5c508b542abd90123ed73413d1
parent81dfe7bfeae2b91bfa3e8c04ef6dac1d8450c6d3
am 934b8ca5: resolved conflicts for merge of 8915fd90 to eclair-mr2-plus-aosp

Merge commit '934b8ca57bb5d45d28450c12af3a5c765ba51c12'

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