am 88512f59: am a8313e71: Merge "Fix String16 operator+ to actually work"
am 88512f59: am a8313e71: Merge "Fix String16 operator+ to actually work"

* commit '88512f59bc051a42f4dd70acc8af5622f7e99db6':
  Fix String16 operator+ to actually work

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