tree 9813d5fbd505bd64b973f268fa679496f2c445a3
parent 18192c25f575342597e5f497c69cbd38cd0637d6
parent 26fdf5f5e6d6647184ffa162ceaf5d50df3a53cc
author Elliott Hughes <enh@google.com> 1364414508 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364414508 -0700

am 26fdf5f5: am 8ea23afb: Merge "Make NativeTestTarget more useful for benchmarking."

* commit '26fdf5f5e6d6647184ffa162ceaf5d50df3a53cc':
  Make NativeTestTarget more useful for benchmarking.