Merge "Fix bug 3281956 - Cherry-picked from GB"

This commit is contained in:
Adam Powell 2010-12-13 18:06:00 -08:00 committed by Android (Google) Code Review
parent 1182c70f3f
commit b847db0efb

Diff Content Not Available