ref: 5fafa2d5241f5c1497d9f852f2f342dfdae84b0a
parent: e90d17d2408ebe69573844313dad9f8750eb12ad
parent: 4e81a68af77b827d10e01a04ad8a860a7c5969ca
author: Yaowu Xu <yaowu@google.com>
date: Wed Jun 8 05:30:31 EDT 2011
Merge "Further activity masking changes:"