OSDN Git Service

am b2bfc0a7: am bacf4039: (-s ours) am 3fd76bc7: Merge "Simpleperf: fix build error...
authorYabin Cui <yabinc@google.com>
Thu, 27 Aug 2015 14:42:19 +0000 (14:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:42:19 +0000 (14:42 +0000)
* commit 'b2bfc0a7d1d76217086b447f2b92242a181e078a':


Trivial merge