tree 166fb21faaced287ba8dfb8adc9324a8df436a33
parent 8c29df5afcde5e1dd27c3ca21cfdec2af47205d1
parent f7871c31469c6245c1b232a15104704f7481103c
author Narayan Kamath <narayan@google.com> 1401450663 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401450663 +0000

am f7871c31: am b9b31f4b: am bd4d3203: Merge "Support an ABI flag for instrumentation."

* commit 'f7871c31469c6245c1b232a15104704f7481103c':
  Support an ABI flag for instrumentation.