| commit | 4714d3d7a604391d174049a7a595e80ebab2da18 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@android.com> | Tue Apr 01 00:11:00 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 01 00:11:00 2014 +0000 |
| tree | 0c1fdb9dbd43e6c769979baa7e8f7b00428b492c | |
| parent | 2d0ecc1b0071fbdc62f8d1f26bd510cd24ff47c2 [diff] | |
| parent | b34af41e578b1bbc02470d01593c45fe8b04588b [diff] |
am b34af41e: Merge "Fix java version detection when _JAVA_OPTIONS is set." * commit 'b34af41e578b1bbc02470d01593c45fe8b04588b': Fix java version detection when _JAVA_OPTIONS is set.