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