tree b951a1ea5d78cd0b4d14727f13d42d6be2ec8e0d
parent 1d755aaa7b40254d4ebb40d5b970e8f17a0de0c0
parent 87286198486fb43b35b6dcf8c64ca32a2ec60432
author Narayan Kamath <narayan@google.com> 1386352314 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386352314 +0000

am 87286198: am b8d3879e: am 99bb0365: am 948206c0: Merge "Fix tools path on Mac OS for java 7."

* commit '87286198486fb43b35b6dcf8c64ca32a2ec60432':
  Fix tools path on Mac OS for java 7.