OSDN Git Service

am f4b26ea7: resolved conflicts for merge of b0b2a75d to gingerbread-plus-aosp
authorRaphael <raphael@google.com>
Fri, 15 Oct 2010 07:07:54 +0000 (00:07 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 15 Oct 2010 07:07:54 +0000 (00:07 -0700)
commitfd294a76498a93e6497a0b0f110967ae1892376e
tree1b9370781f7bd6da482cd9c71de3a3dfc241ed6c
parentd5854946a4ce3ad3da66542ca3aafb35e9558281
parentf4b26ea7ea0a85e2592a0ec0e439ffa4f3c5a038
am f4b26ea7: resolved conflicts for merge of b0b2a75d to gingerbread-plus-aosp

Merge commit 'f4b26ea7ea0a85e2592a0ec0e439ffa4f3c5a038'

* commit 'f4b26ea7ea0a85e2592a0ec0e439ffa4f3c5a038':
  SDK: fix dx shell script to look for dx.jar in platform-tools