Merge commit 'ab924c909a516eb71fef7c238a20c7755f8170ed' into froyo-plus-aosp * commit 'ab924c909a516eb71fef7c238a20c7755f8170ed': Make EditTextPreference scrollable.
Merge commit 'ab924c909a516eb71fef7c238a20c7755f8170ed' into froyo-plus-aosp * commit 'ab924c909a516eb71fef7c238a20c7755f8170ed': Make EditTextPreference scrollable.