OSDN Git Service

Merge "simpleperf: add inplace-sampler event type." am: a355220f81
authorYabin Cui <yabinc@google.com>
Sat, 4 Feb 2017 01:34:35 +0000 (01:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 4 Feb 2017 01:34:35 +0000 (01:34 +0000)
am: 0da28de17a

Change-Id: I602d45c75feb39040caa099f9f1f38cf1a57db7e


Trivial merge