OSDN Git Service

am ea3fe53a: am 1084911f: am 40d06b25: Merge "POSIX says flock is in <sys/file.h...
authorElliott Hughes <enh@google.com>
Tue, 17 Feb 2015 17:29:53 +0000 (17:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 17 Feb 2015 17:29:53 +0000 (17:29 +0000)
commit46e1da2dee164cc18e93992a9dc75745863d171a
tree249e2d9f282b96d73077f50035bdbdbbfa22b950
parent0b8bed7f18a8367062cba7a1077cdf927bd5a985
parentea3fe53ac520971a26330c355aaf9854f45e60b3
am ea3fe53a: am 1084911f: am 40d06b25: Merge "POSIX says flock is in <sys/file.h>, not <unistd.h>."

* commit 'ea3fe53ac520971a26330c355aaf9854f45e60b3':
  POSIX says flock is in <sys/file.h>, not <unistd.h>.