OSDN Git Service

Merge "Fix <sys/epoll.h> and <sys/system_properties.h> to include proper C++ inclusio...
authorDavid Turner <digit@google.com>
Tue, 9 Feb 2010 22:50:57 +0000 (14:50 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 9 Feb 2010 22:50:57 +0000 (14:50 -0800)
commit16f7d16f9f0273bed58f5e8c74eb0ee11eaa8037
tree071921aedb913150ef86d6840869371ff922aab1
parent53691d7df295eed54742365db1180367e26770f5
parent49f0a8f23bba188466c6ee3652858ef4da228c6f
Merge "Fix <sys/epoll.h> and <sys/system_properties.h> to include proper C++ inclusion guards"