| commit | fd294a76498a93e6497a0b0f110967ae1892376e | [log] [tgz] |
|---|---|---|
| author | Raphael <raphael@google.com> | Fri Oct 15 00:07:54 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 15 00:07:54 2010 -0700 |
| tree | 1b9370781f7bd6da482cd9c71de3a3dfc241ed6c | |
| parent | d5854946a4ce3ad3da66542ca3aafb35e9558281 [diff] | |
| parent | f4b26ea7ea0a85e2592a0ec0e439ffa4f3c5a038 [diff] |
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