am a6cce790: Merge "Fix 2325549: Allow up to 4 lines of summary text in Settings" into froyo
am a6cce790: Merge "Fix 2325549: Allow up to 4 lines of summary text in Settings" into froyo

Merge commit 'a6cce790b24debae49f1df9f039e83e3e29e5cd1' into froyo-plus-aosp

* commit 'a6cce790b24debae49f1df9f039e83e3e29e5cd1':
  Fix 2325549: Allow up to 4 lines of summary text in Settings

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base