tree 584d41d2699ec7871869ff9f8efc1adc0bbebbf5
parent 20034368bcfabeb307d4ff6ee653a9e0287f7fed
parent 6a6aa6f855dd8624d830423edd2e4582e54dcc97
author Martijn Coenen <maco@google.com> 1449267414 -0800
committer android-build-merger <android-build-merger@google.com> 1449267414 -0800

Merge "DO NOT MERGE: add support for new sched tracepoint" into mnc-dr1.5-dev am: e902acb2ec
am: 6a6aa6f855

* commit '6a6aa6f855dd8624d830423edd2e4582e54dcc97':
  DO NOT MERGE: add support for new sched tracepoint