tree 9f619688c1f02b9f7f70a000d179ced942855c89
parent ce70311b67c3dba6ed4fbda41617f4e24c82dfc7
parent 9425f923fae8977d09d924436148d3808032ea98
author Romain Guy <romainguy@google.com> 1365800279 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1365800280 +0000

Merge "Add async events tracing to android.os.Trace" into jb-mr2-dev