Merged the trunk r8901:8904
authorAndrey Kamaev <no@email>
Mon, 2 Jul 2012 13:46:47 +0000 (13:46 +0000)
committerAndrey Kamaev <no@email>
Mon, 2 Jul 2012 13:46:47 +0000 (13:46 +0000)
commitaf912f4843f047329319ba6208a7ccc7ba09a221
treed88c46ee300bc02b2760bf54bfe322e7298496e8
parent721c24bc1f1632f7c6ab11000c8d3def998e5e83
Merged the trunk r8901:8904
android/package/CMakeLists.txt
cmake/OpenCVDetectAndroidSDK.cmake
modules/java/generator/src/java/android+Utils.java
samples/android/face-detection/.cproject [new file with mode: 0644]
samples/android/face-detection/.project
samples/android/tutorial-3-native/.cproject [new file with mode: 0644]
samples/android/tutorial-3-native/.project
samples/android/tutorial-4-mixed/.cproject [new file with mode: 0644]
samples/android/tutorial-4-mixed/.project