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