tree 071921aedb913150ef86d6840869371ff922aab1
parent 53691d7df295eed54742365db1180367e26770f5
parent 49f0a8f23bba188466c6ee3652858ef4da228c6f
author David Turner <digit@google.com> 1265755857 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1265755857 -0800

Merge "Fix <sys/epoll.h> and <sys/system_properties.h> to include proper C++ inclusion guards"