tree f4be7cc61725f80a157ba5febaa36dba8e1fd91e
parent eaf82374186bd7084826f1cd258c82a3c6a4bf29
parent 6d8b21a84c92904a966d77f3c6c0282e92c2b077
author Narayan Kamath <narayan@google.com> 1392126277 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1392126277 -0800

am 6d8b21a8: Merge "Fix TinyHashMap to use generic hash_type instead of hash_t"

* commit '6d8b21a84c92904a966d77f3c6c0282e92c2b077':
  Fix TinyHashMap to use generic hash_type instead of hash_t