| commit | aa02f40c1b32eb43c6b340300e4e4719c4975081 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Thu Oct 29 19:29:38 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 29 19:29:38 2009 -0700 |
| tree | 85e88f610dfe72b74dadadaae395cb97ae216e2c | |
| parent | 8d0b3af557553992d8a4f1eab6567c6535544f92 [diff] | |
| parent | f7f145dc0443ffa396304c2547ff9c15638c4dad [diff] |
am f7f145dc: am 275de810: Merge change I2089d86d into eclair-sdk Merge commit 'f7f145dc0443ffa396304c2547ff9c15638c4dad' into eclair-mr2 * commit 'f7f145dc0443ffa396304c2547ff9c15638c4dad': Fix the android launcher script to not force Java 1.5 on MacOS