From: Elliott Hughes <enh@google.com>
Date: Tue, 17 Feb 2015 17:29:53 +0000 (+0000)
Subject: am ea3fe53a: am 1084911f: am 40d06b25: Merge "POSIX says flock is in <sys/file.h... 
X-Git-Tag: android-x86-6.0-r1~301
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=46e1da2dee164cc18e93992a9dc75745863d171a;p=android-x86%2Fbionic.git

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>.
---

46e1da2dee164cc18e93992a9dc75745863d171a