commit | 540a1849cb30a37f070fb7f252f5221ba41a0d4f | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Wed May 28 22:17:56 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 28 22:17:56 2014 +0000 |
tree | cf2e9ba532bec408f7e0735c69b9e9b4224aa44d | |
parent | 1142d8eceae962d481d922358ebe9837ba975a2a [diff] | |
parent | b3697ec2cb75d4f13c22a54b0ef90f4e8fb46e02 [diff] |
am b3697ec2: am c752d6dd: am bf082ffb: Merge "Updated trace.h to recognize ATRACE_TAG_BIONIC." * commit 'b3697ec2cb75d4f13c22a54b0ef90f4e8fb46e02': Updated trace.h to recognize ATRACE_TAG_BIONIC.