OSDN Git Service

am 0ad1301e: (-s ours) am 68cb694f: Merge "Simpleperf: support multiple event types...
authorYabin Cui <yabinc@google.com>
Thu, 27 Aug 2015 11:17:32 +0000 (11:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:17:32 +0000 (11:17 +0000)
* commit '0ad1301e17e662130ca718be2b81e2b8f060bb76':


Trivial merge