Merge "Make activity masking functions static"
authorJohn Koleszar <jkoleszar@google.com>
Thu, 19 May 2011 18:12:18 +0000 (11:12 -0700)
committerCode Review <code-review@webmproject.org>
Thu, 19 May 2011 18:12:18 +0000 (11:12 -0700)

Trivial merge