OSDN Git Service

am acda9614: Merge "Change ResourceType cookies to int32_t."
authorNarayan Kamath <narayan@google.com>
Mon, 3 Feb 2014 22:09:54 +0000 (14:09 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 3 Feb 2014 22:09:54 +0000 (14:09 -0800)
* commit 'acda961446f52b555d9c38757a68b5b15d26fd0b':
  Change ResourceType cookies to int32_t.


Trivial merge