OSDN Git Service

am 0c238ed4: (-s ours) am 224d3ba8: Merge "Simpleperf: correct the event type name...
authorYabin Cui <yabinc@google.com>
Thu, 27 Aug 2015 11:17:17 +0000 (11:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:17:17 +0000 (11:17 +0000)
* commit '0c238ed4ec7a8f81665dbb6b5c4a6b0f97a569a7':


Trivial merge