ref: fdc198c9dea53b5518e8a624a059bb8f86e66c85
parent: 8325464afa924dbbbda946b8de5cee6fd0f3ff70
parent: e434d08fd91696d6c860e4390f20cd04968d98e5
author: Paul Wilkins <paulwilkins@google.com>
date: Wed Apr 16 10:24:25 EDT 2014
Merge "Remove old activity masking code."