am ee4831c4: Merge "Added char limit to string" into gingerbread

Merge commit 'ee4831c4bb39144b995ea561ad35b9b0e1864b33' into gingerbread-plus-aosp

* commit 'ee4831c4bb39144b995ea561ad35b9b0e1864b33':
  Added char limit to string