| commit | 1988249e35cd15677bf72f66e50979b5ebd39a28 | [log] [tgz] |
|---|---|---|
| author | Raphael <raphael@google.com> | Fri Oct 15 00:28:57 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 15 00:28:57 2010 -0700 |
| tree | f3cf6f470b306b4495190a80eb21889a9050d7cf | |
| parent | 6541d2e5e0aedbec315a6b6479840cced8975557 [diff] | |
| parent | fd294a76498a93e6497a0b0f110967ae1892376e [diff] |
am fd294a76: am f4b26ea7: resolved conflicts for merge of b0b2a75d to gingerbread-plus-aosp Merge commit 'fd294a76498a93e6497a0b0f110967ae1892376e' into dalvik-dev * commit 'fd294a76498a93e6497a0b0f110967ae1892376e': SDK: fix dx shell script to look for dx.jar in platform-tools