commit | 758c8636c6804f67db0b05617ff37f0a0d0ba859 | [log] [tgz] |
---|---|---|
author | Christopher Ferris <cferris@google.com> | Fri Jan 17 19:26:16 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 17 19:26:16 2014 +0000 |
tree | 3256a94e45303d171597e225ab9f24f026312527 | |
parent | 47fa90641e5321f853d50de1e129b6233fa183e1 [diff] | |
parent | 6ecdff5baeb8102438c7f91cd2297b8feaaa5081 [diff] |
am 6ecdff5b: am f7adcfc8: am 17b9c827: Merge "Add PROT_* constants not found on windows." * commit '6ecdff5baeb8102438c7f91cd2297b8feaaa5081': Add PROT_* constants not found on windows.