Merge "Converted function to inline"
authorJim Bankoski <jimbankoski@google.com>
Mon, 10 Feb 2014 19:34:25 +0000 (11:34 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Mon, 10 Feb 2014 19:34:25 +0000 (11:34 -0800)

Trivial merge