commit | 319de1758cca4efcd18be773aba6c0b7e36dcbaf | [log] [tgz] |
---|---|---|
author | repo sync <digit@google.com> | Tue Sep 28 12:48:34 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 28 12:48:34 2010 -0700 |
tree | 70caf979672d77b24188e7952c7fc2e1d81c22d3 | |
parent | 2336503264b9a274d8c05e9d439000a7b1c42858 [diff] | |
parent | 686af0b3a5978356be3b1a97187c765d63f11623 [diff] |
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.