Merge "Fix More TextViewTest Landscape Issues" into froyo