am bb2e031a: am 65b08486: Merge "Add APIs for application-generated systrace...
am bb2e031a: am 65b08486: Merge "Add APIs for application-generated systrace events" into jb-mr2-dev
* commit 'bb2e031a':
Add APIs for application-generated systrace events