OSDN Git Service

am e3f8854d: (-s ours) am a209544b: Merge "Simpleperf: fix build on mac."
authorYabin Cui <yabinc@google.com>
Thu, 27 Aug 2015 11:17:06 +0000 (11:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:17:06 +0000 (11:17 +0000)
commit2940248da9d5c6af117e46665d470f3c643d9ef2
treea4db20500e7130fd7856f1fff2d10d10c5234160
parente4e77fdfda38bdfb6234fb874e8ea26b0e7679a9
parente3f8854d3dd66f2508beabe07f7455b3739d3c2a
am e3f8854d: (-s ours) am a209544b: Merge "Simpleperf: fix build on mac."

* commit 'e3f8854d3dd66f2508beabe07f7455b3739d3c2a':