tree a88b292578ebe466e5510619d99816863414b855
parent bf5b57a50040dd8f6730f05bdd451ec0fb7976bf
parent 3ad0c75c07c81669f8bf722b64cddfcc8058661c
author Ben Cheng <bccheng@android.com> 1390998029 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1390998029 +0000

am 3ad0c75c: Merge "perf: compile for arm until perf has arm64 support"

* commit '3ad0c75c07c81669f8bf722b64cddfcc8058661c':
  perf: compile for arm until perf has arm64 support