OSDN Git Service

Merge "Handle additional record types in perf.data reader." am: d9aa9de346
authorThan McIntosh <thanm@google.com>
Thu, 2 Jun 2016 18:50:02 +0000 (18:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 2 Jun 2016 18:50:02 +0000 (18:50 +0000)
am: 4ee0c018b3

* commit '4ee0c018b326327e25174f6be876686d21edb152':
  Handle additional record types in perf.data reader.

Change-Id: Ife09330d206ad18b161eb6ac392151803525fb18


Trivial merge