OSDN Git Service

resolved conflicts for 6239958b to stage-aosp-master
authorYabin Cui <yabinc@google.com>
Mon, 21 Sep 2015 19:28:46 +0000 (12:28 -0700)
committerYabin Cui <yabinc@google.com>
Mon, 21 Sep 2015 19:28:46 +0000 (12:28 -0700)
commit19c8d5f55b1ff4f6953eb53019d148adab0459a5
treef11d3aebe86d9b589724a55b3f55afaa981290ab
parenta228293f231c513a8690b033ad3c68c7213bc2d0
parent6239958bddfb47562dc8068977bc1bf695973394
resolved conflicts for 6239958b to stage-aosp-master

Change-Id: I66d12e9a15b5e6aecd4938b9ce4ac76a0f3863e4
simpleperf/workload.cpp