OSDN Git Service

(root) / android-x86 / bionic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0b8bed7 ea3fe53)
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)
* commit 'ea3fe53ac520971a26330c355aaf9854f45e60b3':
  POSIX says flock is in <sys/file.h>, not <unistd.h>.


Trivial merge
bionic
About OSDN
Find Software
Develop Software
Help