OSDN Git Service

am 83e0d872: am cc22abb7: (-s ours) am 32ee7cc0: Merge "Simpleperf: don\'t check...
authorYabin Cui <yabinc@google.com>
Thu, 27 Aug 2015 14:42:53 +0000 (14:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:42:53 +0000 (14:42 +0000)
* commit '83e0d872414dd68eea1d65fddd3486d6b3351cf4':


Trivial merge