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