am ce6578ac: am 84bee4f8: Merge "Fix copyStringToBuffer row index calculation. Bug: 5515552" into ics-mr0
am ce6578ac: am 84bee4f8: Merge "Fix copyStringToBuffer row index calculation. Bug: 5515552" into ics-mr0

* commit 'ce6578acc5729f76fc93b6daafede413703a8d19':
  Fix copyStringToBuffer row index calculation. Bug: 5515552

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