OSDN Git Service

am 6a116f86: am eb2e4a48: (-s ours) am 5c9978ce: Merge "Simpleperf: use ThreadTree...
authorYabin Cui <yabinc@google.com>
Thu, 27 Aug 2015 14:42:33 +0000 (14:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:42:33 +0000 (14:42 +0000)
* commit '6a116f863826943b1ec78d8f6bf84714daa70620':


Trivial merge