| commit | f966bda49f4fdf749c91b30e9819c85ca9dab063 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@android.com> | Tue Apr 01 00:15:50 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 01 00:15:50 2014 +0000 |
| tree | 34c0546e5c476d3a390797821e95bea1038f0a19 | |
| parent | fc1a735ec618791df306ad2a8f2f94a3db10284d [diff] | |
| parent | 4714d3d7a604391d174049a7a595e80ebab2da18 [diff] |
am 4714d3d7: am b34af41e: Merge "Fix java version detection when _JAVA_OPTIONS is set." * commit '4714d3d7a604391d174049a7a595e80ebab2da18': Fix java version detection when _JAVA_OPTIONS is set.