OSDN Git Service

am 2940248d: am e3f8854d: (-s ours) am a209544b: Merge "Simpleperf: fix build on...
authorYabin Cui <yabinc@google.com>
Thu, 27 Aug 2015 14:42:24 +0000 (14:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:42:24 +0000 (14:42 +0000)
commit48fffacbd109927d792243652dc8151ad35e4a99
tree23cc56c57eaae8cb3e9a9f81bdb7e881a5389b5f
parent24a881079be8939d344197c9aafe9c174270c744
parent2940248da9d5c6af117e46665d470f3c643d9ef2
am 2940248d: am e3f8854d: (-s ours) am a209544b: Merge "Simpleperf: fix build on mac."

* commit '2940248da9d5c6af117e46665d470f3c643d9ef2':