tree 5c0af6240d63bf13a05f86c2572038e95ef45366
parent 4b0af48a216180d6d21a2a6225308e6ad6a8d2e1
parent e77cb9317de54ea0041eeef7966b818257158f64
author Elliott Hughes <enh@google.com> 1401325686 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401325686 +0000

am e77cb931: am 259c2508: am 03e2f8fa: Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC."

* commit 'e77cb9317de54ea0041eeef7966b818257158f64':
  Modified atrace.cpp to recognize ATRACE_TAG_BIONIC.