OSDN Git Service

(root) / android-x86 / bionic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a822795 1084911)
am 1084911f: am 40d06b25: Merge "POSIX says flock is in <sys/file.h>, not <unistd...
authorElliott Hughes <enh@google.com>
Tue, 17 Feb 2015 17:23:26 +0000 (17:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 17 Feb 2015 17:23:26 +0000 (17:23 +0000)
* commit '1084911fc297b262600a5caed9a94d6ddde7cc66':
  POSIX says flock is in <sys/file.h>, not <unistd.h>.


Trivial merge
bionic
About OSDN
Find Software
Develop Software
Help