am be8db119: Merge "Fix NPE in Html.inParagraph()" into mnc-dev
am be8db119: Merge "Fix NPE in Html.inParagraph()" into mnc-dev

* commit 'be8db119726a229ca687b99fcdb8a6a959648cd1':
  Fix NPE in Html.inParagraph()

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