commit 3b6849f72d1866d81f333b2c27aed35ba768e3bd
author Mika Raento <mikie@google.com> Thu Apr 26 11:25:07 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Apr 26 11:25:07 2018 -0700
tree a3ebf0de051b904ebca2f20510d90404d3dfc019
parent 9800b8774028e7ddce02d105e1567bfe4afb1ce9
parent d9573866700506b10b2eb069ce8c11d2ef850538

Merge "Systrace support for NNAPI" am: da2535c0ea
am: fdc259bfb5

Change-Id: I1febcefc09c44353935cb63f9d326ac5721cdbea

libcutils/include/cutils/trace.h

diff --git a/libcutils/include/cutils/trace.h b/libcutils/include/cutils/trace.h
index bbb150d..58b9f09 100644
--- a/libcutils/include/cutils/trace.h
+++ b/libcutils/include/cutils/trace.h
@@ -74,7 +74,8 @@
 #define ATRACE_TAG_ADB              (1<<22)
 #define ATRACE_TAG_VIBRATOR         (1<<23)
 #define ATRACE_TAG_AIDL             (1<<24)
-#define ATRACE_TAG_LAST             ATRACE_TAG_AIDL
+#define ATRACE_TAG_NNAPI            (1<<25)
+#define ATRACE_TAG_LAST             ATRACE_TAG_NNAPI
 
 // Reserved for initialization.
 #define ATRACE_TAG_NOT_READY        (1ULL<<63)