OSDN Git Service
(root)
/
android-x86
/
sdk.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f858411
bd397a4
)
am f7f145dc: am 275de810: Merge change I2089d86d into eclair-sdk
author
Xavier Ducrohet
<xav@android.com>
Fri, 30 Oct 2009 02:29:38 +0000
(19:29 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 30 Oct 2009 02:29:38 +0000
(19:29 -0700)
Merge commit '
f7f145dc0443ffa396304c2547ff9c15638c4dad
' into eclair-mr2
* commit '
f7f145dc0443ffa396304c2547ff9c15638c4dad
':
Fix the android launcher script to not force Java 1.5 on MacOS
Trivial merge