am 34ed21c5: Shortening a string.

Merge commit '34ed21c546af1a56ffd8e805809bf334cb7c96a5' into gingerbread-plus-aosp

* commit '34ed21c546af1a56ffd8e805809bf334cb7c96a5':
  Shortening a string.