OSDN Git Service

am 72bc5a83: am 0ad1301e: (-s ours) am 68cb694f: Merge "Simpleperf: support multiple...
authorYabin Cui <yabinc@google.com>
Thu, 27 Aug 2015 14:43:09 +0000 (14:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:43:09 +0000 (14:43 +0000)
commitb62c1ca9881d9c63edc5283fa068b01a15caba13
tree23cc56c57eaae8cb3e9a9f81bdb7e881a5389b5f
parentda6fdabda6511af912329945de23c78f699d106f
parent72bc5a83d9b1323513a2bceddf271eda368fad3b
am 72bc5a83: am 0ad1301e: (-s ours) am 68cb694f: Merge "Simpleperf: support multiple event types in record command."

* commit '72bc5a83d9b1323513a2bceddf271eda368fad3b':