am 236d0520: Merge "Fix bug 7054190 line breaks at inappropriate places" into jb-mr1-dev
am 236d0520: Merge "Fix bug 7054190 line breaks at inappropriate places" into jb-mr1-dev

* commit '236d0520a609e1cc9c8d0ae8f752a83ca56150f9':
  Fix bug 7054190 line breaks at inappropriate places

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