OSDN Git Service

am 686af0b3: resolved conflicts for merge of defd1622 to gingerbread-plus-aosp
authorrepo sync <digit@google.com>
Tue, 28 Sep 2010 19:48:34 +0000 (12:48 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 28 Sep 2010 19:48:34 +0000 (12:48 -0700)
commit319de1758cca4efcd18be773aba6c0b7e36dcbaf
tree70caf979672d77b24188e7952c7fc2e1d81c22d3
parent2336503264b9a274d8c05e9d439000a7b1c42858
parent686af0b3a5978356be3b1a97187c765d63f11623
am 686af0b3: resolved conflicts for merge of defd1622 to gingerbread-plus-aosp

Merge commit '686af0b3a5978356be3b1a97187c765d63f11623'

* commit '686af0b3a5978356be3b1a97187c765d63f11623':
  libc: add <sys/eventfd.h> and corresponding implementations.
libc/Android.mk
libc/include/sys/linux-unistd.h