OSDN Git Service

am dd9e65c9: am f0737a5a: (-s ours) am ae5cab41: Merge "Simpleperf: work around unexp...
authorYabin Cui <yabinc@google.com>
Thu, 27 Aug 2015 14:42:34 +0000 (14:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:42:34 +0000 (14:42 +0000)
commit4ad7c9500dbdfcdb40208257234eb3443fc1572b
tree23cc56c57eaae8cb3e9a9f81bdb7e881a5389b5f
parentebfbca7c15c22186e96a650e73c2af1c629d7b82
parentdd9e65c9c4822860f41a41b59f43955e354e035e
am dd9e65c9: am f0737a5a: (-s ours) am ae5cab41: Merge "Simpleperf: work around unexpected (pid, tid) pair."

* commit 'dd9e65c9c4822860f41a41b59f43955e354e035e':