Merge "remove __inline for compiler compatibility"
authorJames Berry <jamesberry@google.com>
Wed, 21 Mar 2012 19:37:17 +0000 (12:37 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 21 Mar 2012 19:37:17 +0000 (12:37 -0700)

Trivial merge