tree 3c0251daf046fa0098fc4661cd3707519e60e61a
parent 107b1a9ee6c8e96027bec7a0caf16f723efd39ce
parent 275de810e99814cefd11321fd934bda1a4b53cc9
author Xavier Ducrohet <xav@android.com> 1256845143 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256845143 -0700

am 275de810: Merge change I2089d86d into eclair-sdk

Merge commit '275de810e99814cefd11321fd934bda1a4b53cc9' into eclair

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