commit df0e9ed5536e2cab860f3ecf9dab0030a471766e
author Elliott Hughes <enh@google.com> Wed May 28 21:41:30 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed May 28 21:41:30 2014 +0000
tree 5a2f8657ed14d6f63ca2fa7b3c8d3223d0dfee3b
parent 98993813b31f20c27f2c0a91daebdaedc382bb5b
parent 862be91276ec9532b3ed00d43fc7a750f1e6adb0

am 862be912: Merge "Updated Trace.h to recognize ATRACE_TAG_BIONIC."

* commit '862be91276ec9532b3ed00d43fc7a750f1e6adb0':
  Updated Trace.h to recognize ATRACE_TAG_BIONIC.

core/java/android/os/Trace.java

diff --git a/core/java/android/os/Trace.java b/core/java/android/os/Trace.java
index 3249bcb..bc84e64 100644
--- a/core/java/android/os/Trace.java
+++ b/core/java/android/os/Trace.java
@@ -72,6 +72,8 @@
     public static final long TRACE_TAG_DALVIK = 1L << 14;
     /** @hide */
     public static final long TRACE_TAG_RS = 1L << 15;
+    /** @hide */
+    public static final long TRACE_TAG_BIONIC = 1L << 16;
 
     private static final long TRACE_TAG_NOT_READY = 1L << 63;
     private static final int MAX_SECTION_NAME_LEN = 127;