OSDN Git Service

am f7f145dc: am 275de810: Merge change I2089d86d into eclair-sdk
authorXavier Ducrohet <xav@android.com>
Fri, 30 Oct 2009 02:29:38 +0000 (19:29 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 30 Oct 2009 02:29:38 +0000 (19:29 -0700)
commiteee6405fefd9f5b8106a5d6415645a1f347456ac
tree86d07d1378bf67e175df4e7d4e0bdbfb10ad44e4
parentf85841100d1f1ca158d8b6adb86d5d4c0c7d3c80
parentbd397a4d7cdc414e7d5e30a42847b9bb5f28613b
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