OSDN Git Service

resolved conflicts for merge of defd1622 to gingerbread-plus-aosp
authorrepo sync <digit@google.com>
Tue, 28 Sep 2010 10:23:55 +0000 (12:23 +0200)
committerrepo sync <digit@google.com>
Tue, 28 Sep 2010 10:23:55 +0000 (12:23 +0200)
commit686af0b3a5978356be3b1a97187c765d63f11623
treef0fcad6936e22c50d5fadb314efc8b3388e6b0db
parenta511f245614d8e6c7700df624e13a41a084ad7e4
parentdefd162212de3789d2268a1f3339c2a6097fa825
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
libc/Android.mk
libc/SYSCALLS.TXT
libc/arch-arm/syscalls.mk
libc/include/sys/linux-unistd.h