Merge "Made ProfilerStub return null instead of a dummy ScopedCallback"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 27 Mar 2015 16:44:22 +0000 (16:44 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 27 Mar 2015 16:44:22 +0000 (16:44 +0000)

Trivial merge