OSDN Git Service

am f0749467: (-s ours) am 3c599ffc: Merge "Simpleperf: demangle symbols only when...
authorYabin Cui <yabinc@google.com>
Thu, 27 Aug 2015 11:17:29 +0000 (11:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:17:29 +0000 (11:17 +0000)
* commit 'f074946783516e0ae4d516ae11ad65217e884086':


Trivial merge