tree a406ee4ef9195583f008953e9733a2367cf1e1f0
parent 46964d6c223844f362a134cef0ed1d4882704426
parent a355220f81348774ed391c77c4e7be042635ba66
author Yabin Cui <yabinc@google.com> 1486171924 +0000
committer android-build-merger <android-build-merger@google.com> 1486171924 +0000

Merge "simpleperf: add inplace-sampler event type."
am: a355220f81

Change-Id: I7a2ba78e9f664d680c33d0428a3ca2acf68ec0b2