merge in ics-release history after reset to master
diff --git a/include/cutils/compiler.h b/include/cutils/compiler.h
index 09112d5..70f884a 100644
--- a/include/cutils/compiler.h
+++ b/include/cutils/compiler.h
@@ -29,4 +29,16 @@
# define CC_UNLIKELY( exp ) (__builtin_expect( !!(exp), 0 ))
#endif
+/**
+ * exports marked symbols
+ *
+ * if used on a C++ class declaration, this macro must be inserted
+ * after the "class" keyword. For instance:
+ *
+ * template <typename TYPE>
+ * class ANDROID_API Singleton { }
+ */
+
+#define ANDROID_API __attribute__((visibility("default")))
+
#endif // ANDROID_CUTILS_COMPILER_H
diff --git a/include/system/camera.h b/include/system/camera.h
index 86b62b7..cdfa256 100644
--- a/include/system/camera.h
+++ b/include/system/camera.h
@@ -227,8 +227,7 @@
int32_t number_of_faces;
/**
- * An array of the detected faces. The length is number_of_faces. The list
- * is sorted by the score. The highest score is the first element.
+ * An array of the detected faces. The length is number_of_faces.
*/
camera_face_t *faces;
} camera_frame_metadata_t;