ref: 0e862352650de8fc2a7e2287e385ddf6ca43ba3b
parent: 71a7501bcf6ada5068d102c03ae597023e986538
parent: ff52bf369146ebd99c70c880d92d94a876432883
author: Paul Wilkins <paulwilkins@google.com>
date: Fri May 13 05:23:50 EDT 2011
Merge "Restructure of activity masking code."