tree 5b04fb0f9d5678af44bfa09d3068e24fd0595baa
parent 1bc314d3dda8a2e34d48c3811c0b29b9135f9051
parent aa3e17e1b685218cddeb7a05e68ff1721a322147
author Elliott Hughes <enh@google.com> 1416508992 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416508992 +0000

am aa3e17e1: Merge "Return path including executable instead of without"

* commit 'aa3e17e1b685218cddeb7a05e68ff1721a322147':
  Return path including executable instead of without