Merge "Ensure <fcntl.h> defines the S_* constants from <sys/stat.h>."
authorElliott Hughes <enh@google.com>
Mon, 29 Dec 2014 19:40:44 +0000 (19:40 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 29 Dec 2014 19:40:45 +0000 (19:40 +0000)

Trivial merge