Merge "Fix remaining issue with bug #5904777"

This commit is contained in:
Philip Milne 2012-02-17 10:06:47 -08:00 committed by Android (Google) Code Review
commit 939000dfd0

Diff Content Not Available