OSDN Git Service

am 275de810: Merge change I2089d86d into eclair-sdk
authorXavier Ducrohet <xav@android.com>
Thu, 29 Oct 2009 19:39:03 +0000 (12:39 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 29 Oct 2009 19:39:03 +0000 (12:39 -0700)
Merge commit '275de810e99814cefd11321fd934bda1a4b53cc9' into eclair

* commit '275de810e99814cefd11321fd934bda1a4b53cc9':
  Fix the android launcher script to not force Java 1.5 on MacOS


Trivial merge