OSDN Git Service

Merge "simpleperf: enable two options by default." am: 7386d10cce am: 848d294253
authorYabin Cui <yabinc@google.com>
Fri, 19 May 2017 18:11:03 +0000 (18:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 May 2017 18:11:03 +0000 (18:11 +0000)
commit753e534226860f2ffc14c0b18b3ce594142648f5
tree4e91313f285f20dc07fddd21f4232eeedddd8535
parent6b23f54ef4c3ebce213cd7c14772ac23e66f2f7d
parentd2f70f60c5735a9dcea766fea95dba6f5ee021a1
Merge "simpleperf: enable two options by default." am: 7386d10cce am: 848d294253
am: d2f70f60c5

Change-Id: I9cbf0eaacdc8bdffba43013028c5203a7c46e516