| commit | d49babe50d61e0264a9f4fbf0b4e182cc56635db | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Fri Jan 31 16:29:19 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 31 16:29:19 2014 +0000 |
| tree | 7ae7eb3048e7de1f89e59142cbd387e46f23c017 | |
| parent | ff62e966b60bb20dc7c3384485816b1e7bf06057 [diff] | |
| parent | 9af955744d4e0d82b61fc99a932b9a5cf28b5df7 [diff] |
am 9af95574: am 1cadc07d: Merge "Change ResourceType cookies to int32_t." * commit '9af955744d4e0d82b61fc99a932b9a5cf28b5df7': Change ResourceType cookies to int32_t.