OSDN Git Service

am 0653bb7d: (-s ours) am 60bbb93d: Merge "Simpleperf: Fix unused parameter"
authorAndreas Gampe <agampe@google.com>
Thu, 27 Aug 2015 11:16:57 +0000 (11:16 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:16:57 +0000 (11:16 +0000)
* commit '0653bb7d881efb6faa64f2dcc7d099d5287e22a2':


Trivial merge