tree d4fc5ee2b10a3e2d191c21346cd6aa3e535351f8
parent f984eb42724e66326549d7bf33a7ec1515a7ff3c
parent fbc8df03e498baf47ff1a5e05e182f1bcd60c770
author John Reck <jreck@google.com> 1416345827 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1416345830 +0000

Merge "Trace some interesting events" into lmp-mr1-dev