Merge "Cleanup for bug 5278763"

This commit is contained in:
Ben Murdoch 2011-09-20 10:32:28 -07:00 committed by Android (Google) Code Review
commit d3c6207372

Diff Content Not Available