Merge remote-tracking branch 'origin/2.4' into merge-2.4
[profile/ivi/opencv.git] / modules / java / android_test / src / org / opencv /
drwxr-xr-x   ..
drwxr-xr-x - test