am 280d250c: am 956b23f4: am a0364e23: Merge "Fix infinite recursion in hashcode of Spannables" into klp-dev

* commit '280d250c70db2c096f3639307235a4d62f0ca38f':
  Fix infinite recursion in hashcode of Spannables