OSDN Git Service

am 9dfb0e75: (-s ours) am 5f0c337d: Merge "Simpleperf: add raw data in sample records...
authorYabin Cui <yabinc@google.com>
Thu, 27 Aug 2015 11:17:30 +0000 (11:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:17:30 +0000 (11:17 +0000)
* commit '9dfb0e756a2c053dbd398ea3a9ea0521f6eadde3':


Trivial merge