am 7cff91ea: am 079cfa64: Merge "Frameworks/base: Fix a hashCode implementation"

* commit '7cff91ea67f89ca963a822daa1b68674bfc0e587':
  Frameworks/base: Fix a hashCode implementation