Merge change 10365

* changes:
  Fix hyphenation in TextView attr Javadoc