am 4525c981: Merge "Fix regression introduced when fixing focus issue with...
am 4525c981: Merge "Fix regression introduced when fixing focus issue with ScrollView. Bug #2581646" into froyo
Merge commit '4525c981' into froyo-plus-aosp
* commit '4525c981':
Fix regression introduced when fixing focus issue with ScrollView.