tree 64713be88c9eaae5f8d8f8b0b5fa6c3b3426ba9d
parent 2586499bd95a80b5fc8759f0c36e87b387e88603
parent 5605454636f9dfa29d85e0606d5e86ac7ca1cab3
author Elliott Hughes <enh@google.com> 1426231292 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426231292 +0000

am 56054546: am 30d72342: Merge "Remove the perfhost target."

* commit '5605454636f9dfa29d85e0606d5e86ac7ca1cab3':
  Remove the perfhost target.