am cc3d920a: am d3143a3f: am e1fcced6: Merge "Make unicodeWrap() return null if the input string is null." into mnc-dev
am cc3d920a: am d3143a3f: am e1fcced6: Merge "Make unicodeWrap() return null if the input string is null." into mnc-dev

* commit 'cc3d920a368b50e5c8f3df4c0cf08c62ddfef49f':
  Make unicodeWrap() return null if the input string is null.

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