commit | e77cb9317de54ea0041eeef7966b818257158f64 | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Thu May 29 01:04:28 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 29 01:04:28 2014 +0000 |
tree | d4c53b97546021a0138b9a0dea877176bef0ab35 | |
parent | 28ec03035d61828047f6bbc57be3b71f4c57b7fb [diff] | |
parent | 259c25080d8b7f3b66e27e4d8ac3a268738ebe3f [diff] |
am 259c2508: am 03e2f8fa: Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC." * commit '259c25080d8b7f3b66e27e4d8ac3a268738ebe3f': Modified atrace.cpp to recognize ATRACE_TAG_BIONIC.