tree 5c4ba71ffa68a8094c3849dafa7126d6b6da88f2
parent b9f960e094d53440be5c7e8759a74dbb0ab57317
parent 7c4887f66bfa3dad16f8b03dc825ade96d7de130
author Narayan Kamath <narayan@google.com> 1391177627 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1391177628 +0000

Merge "Change ResourceType cookies to int32_t."