OSDN Git Service

am 8acc1fc0: (-s ours) am e7da7e9b: Simpleperf: remove abort in child process.
authorYabin Cui <yabinc@google.com>
Thu, 27 Aug 2015 11:16:58 +0000 (11:16 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:16:58 +0000 (11:16 +0000)
* commit '8acc1fc01c91734a51ecdac25dcbc7733ea1b7f9':


Trivial merge