OSDN Git Service

Merge "simpleperf: enable two options by default." am: 7386d10cce am: 848d294253...
authorYabin Cui <yabinc@google.com>
Fri, 19 May 2017 18:12:31 +0000 (18:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 May 2017 18:12:31 +0000 (18:12 +0000)
am: 753e534226

Change-Id: I2ab4432bf6bccf0f73b03ba3e1e3ca1cab0fd973


Trivial merge