merge in ics-release history after reset to master
diff --git a/include/system/graphics.h b/include/system/graphics.h
index 77cd337..729e92c 100644
--- a/include/system/graphics.h
+++ b/include/system/graphics.h
@@ -17,7 +17,9 @@
#ifndef SYSTEM_CORE_INCLUDE_ANDROID_GRAPHICS_H
#define SYSTEM_CORE_INCLUDE_ANDROID_GRAPHICS_H
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
/*
* If the HAL needs to create service threads to handle graphics related
@@ -114,6 +116,8 @@
HAL_TRANSFORM_ROT_270 = 0x07,
};
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
#endif /* SYSTEM_CORE_INCLUDE_ANDROID_GRAPHICS_H */
diff --git a/libnl_2/README b/libnl_2/README
index 7559fdf..14db6db 100644
--- a/libnl_2/README
+++ b/libnl_2/README
@@ -11,12 +11,16 @@
|Netlink Message |P| Generic Netlink |P|
| Header |A| Message Header |A|
|(struct nlmsghdr)|D|(struct genlmsghdr)|D|
-+-----------------+-+-------------------+-+
++-----------------+-+-------------------+-+-------------+
+|len:4|type:2|flags:2|seq:4 pid:4|cmd:1|ver:1|reserved:2|
++--------------------------------+----------------------+
+-----------------+-+-----------------+-+-----------------+-+-----------------+-+---+
|Netlink Attribute|P|Netlink Attribute|P|Netlink Attribute|P|Netlink Attribute|P|...|
| #0 Header |A| #0 Payload |A| #1 Header |A| #1 Payload |A| |
| (struct nlattr) |D| (void) |D| (struct nlattr) |D| (void) |D| |
+-----------------+-+-----------------+-+-----------------+-+-----------------+-+---+
+|len:2(==4+payload)|type:2|payload|pad|
++-------------------------+-------+---+
NETLINK OVERVIEW
@@ -39,7 +43,7 @@
* Not tested for thread safety
Android.mk
- * No static library because of netlink cache not implemented and
+ * No dynamic library because of netlink cache not implemented and
not tested for thread safety
attr.c