OSDN Git Service

am bacf4039: (-s ours) am 3fd76bc7: Merge "Simpleperf: fix build error on mips."
authorYabin Cui <yabinc@google.com>
Thu, 27 Aug 2015 11:17:04 +0000 (11:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:17:04 +0000 (11:17 +0000)
* commit 'bacf4039d7e7e260cf2576a1f25f714344676f09':


Trivial merge