tree 44ef37fc32cea41556e9f895b5e81c86e2301a84
parent 364d8180d51b7960e922baebb730892a169dfa36
parent 9af955744d4e0d82b61fc99a932b9a5cf28b5df7
author Narayan Kamath <narayan@google.com> 1394152676 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394152676 +0000

am 9af95574: am 1cadc07d: Merge "Change ResourceType cookies to int32_t."

* commit '9af955744d4e0d82b61fc99a932b9a5cf28b5df7':
  Change ResourceType cookies to int32_t.