Merge "Fix issues #6103378 and #5959515."

This commit is contained in:
Dianne Hackborn 2012-03-06 10:34:18 -08:00 committed by Android (Google) Code Review
commit d8cd73942f

Diff Content Not Available