am bf082ffb: Merge "Updated trace.h to recognize ATRACE_TAG_BIONIC."

* commit 'bf082ffb71c40e4670410b246309a182d9dafcf5':
  Updated trace.h to recognize ATRACE_TAG_BIONIC.
This commit is contained in:
Elliott Hughes 2014-05-28 21:41:25 +00:00 committed by Android Git Automerger
commit c752d6dd37
1 changed files with 2 additions and 1 deletions

View File

@ -69,7 +69,8 @@ __BEGIN_DECLS
#define ATRACE_TAG_RESOURCES (1<<13)
#define ATRACE_TAG_DALVIK (1<<14)
#define ATRACE_TAG_RS (1<<15)
#define ATRACE_TAG_LAST ATRACE_TAG_RS
#define ATRACE_TAG_BIONIC (1<<16)
#define ATRACE_TAG_LAST ATRACE_TAG_BIONIC
// Reserved for initialization.
#define ATRACE_TAG_NOT_READY (1LL<<63)