| commit | 686af0b3a5978356be3b1a97187c765d63f11623 | [log] [tgz] |
|---|---|---|
| author | repo sync <digit@google.com> | Tue Sep 28 12:23:55 2010 +0200 |
| committer | repo sync <digit@google.com> | Tue Sep 28 12:23:55 2010 +0200 |
| tree | f0fcad6936e22c50d5fadb314efc8b3388e6b0db | |
| parent | a511f245614d8e6c7700df624e13a41a084ad7e4 [diff] | |
| parent | defd162212de3789d2268a1f3339c2a6097fa825 [diff] |
resolved conflicts for merge of defd1622 to gingerbread-plus-aosp Conflicts: libc/arch-arm/syscalls/eventfd.S libc/include/sys/eventfd.h libc/include/sys/linux-syscalls.h Change-Id: I02f6e9536aa5478322240c199ff4c2f4367922d0