am 5bc34b8d: am 2f8435cd: Merge "Fix TextViewTest#testSingleLine" into froyo

* commit '5bc34b8d8ebea6d651641bbc207eb78fb519080b':
  Fix TextViewTest#testSingleLine