tree 96ba772704222fba819529e280e3c02f3db9b12f
parent 149510e010b46a445355a8d7fcdb8401125b92c3
parent 1cadc07dd1e3711fb1e57548038e3026682c5ef8
author Narayan Kamath <narayan@google.com> 1391182218 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1391182218 -0800

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

* commit '1cadc07dd1e3711fb1e57548038e3026682c5ef8':
  Change ResourceType cookies to int32_t.