merged documentation and android service from trunk

2012-07-13 14:27:09 +00:00
parent fbf1973bac
commit fb3d6ecb98
40 changed files with 463 additions and 265 deletions
--- a/android/java.rst
+++ b/android/java.rst
@@ -0,0 +1,6 @@
+********
+Java API
+********
+
+
+`Java API reference external link (JavaDoc) <http://docs.opencv.org/java/>`_