tree f77f8d1a0bfd16730eaff08914ab926b9c42eb63
parent 1fa034a8d1f845d714acc36daae7a08dad30ed4b
parent 9bb313f325797ae8193a2e421f98ea0c801a4d10
author Elliott Hughes <enh@google.com> 1405126149 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405126149 +0000

am 9bb313f3: Merge "Update Android.mk to add perf support for arm64"

* commit '9bb313f325797ae8193a2e421f98ea0c801a4d10':
  Update Android.mk to add perf support for arm64