tree e8621cd6ccfebdd9116df7ae4c32752ec4bcc8d2
parent defe864ab6f971efc00328cee5ea3cb1d69d377d
parent 4e3e9ffbf314500d303724aefbddf1b89094cfd8
author Ying Wang <wangying@android.com> 1413493384 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413493384 +0000

am 4e3e9ffb: Merge "Fix Java detection on some Linux distributions"

* commit '4e3e9ffbf314500d303724aefbddf1b89094cfd8':
  Fix Java detection on some Linux distributions