OSDN Git Service

am 1cadc07d: Merge "Change ResourceType cookies to int32_t."
authorNarayan Kamath <narayan@google.com>
Fri, 31 Jan 2014 15:30:18 +0000 (07:30 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 31 Jan 2014 15:30:18 +0000 (07:30 -0800)
* commit '1cadc07dd1e3711fb1e57548038e3026682c5ef8':
  Change ResourceType cookies to int32_t.


Trivial merge