tree a4e7d14604e9a3453dad337c7af7a7a151d83901
parent 1109006158630c02784a8cf93675c0e14722c27b
parent 7cff91ea67f89ca963a822daa1b68674bfc0e587
author Robert Greenwalt <rgreenwalt@google.com> 1426524526 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426524526 +0000

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

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