am 69d68b69: Merge "Add trace tag for power management." into lmp-dev

* commit '69d68b69e5341124c1947f3110c67aa8836e3437':
  Add trace tag for power management.
This commit is contained in:
Jeff Brown 2014-08-16 03:14:32 +00:00 committed by Android Git Automerger
commit 84a248ce27

View file

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