OSDN Git Service

am a20fa0d9: am aa02f40c: am f7f145dc: am 275de810: Merge change I2089d86d into eclai...
authorXavier Ducrohet <xav@android.com>
Fri, 30 Oct 2009 03:08:41 +0000 (20:08 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 30 Oct 2009 03:08:41 +0000 (20:08 -0700)
commit26cfb5c1abaa421b7336f91090e8448ae944b488
tree582b0c0f2a7af6db8cdb4d6c37131a78b9741a2a
parent7aacadb7a7f4fdef61d21b45ef46e17bd560c84a
parent89ebf0df2facf1ad9796591bbb7e8599102071d8
am a20fa0d9: am aa02f40c: am f7f145dc: am 275de810: Merge change I2089d86d into eclair-sdk

Merge commit 'a20fa0d9398bfcd9b9b473a5040139e6ab0d6e52'

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