tree a85317dc0f4883029676a2eeb7d33066132480c8
parent 8896254d1cd5fb9b3b4c12e766aa680f831941f5
parent b1c428c4c8bf988a11ab4a22a98cce4b7601d62c
author Elliott Hughes <enh@google.com> 1472872926 +0000
committer android-build-merger <android-build-merger@google.com> 1472872926 +0000

Merge "Use android::base::GetExecutablePath in simpleperf." am: 3eee005507 am: 7633b9ee01 am: cb12c4f0d4
am: b1c428c4c8

Change-Id: I2bd7deeeb81bafde4e8088cb510f7d2069fe2481