OSDN Git Service

am eb2e4a48: (-s ours) am 5c9978ce: Merge "Simpleperf: use ThreadTree when getting...
authorYabin Cui <yabinc@google.com>
Thu, 27 Aug 2015 11:17:11 +0000 (11:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:17:11 +0000 (11:17 +0000)
* commit 'eb2e4a48c5e2d1738865896cb8b75134d50f7a7d':


Trivial merge