Minor wording fixes in internal Android documentation
Added sanity data for HoughLines performance test
Merge pull request #220 from akarsakov:ocl_houghlines_perf_test
Merge pull request #217 from PhilLab:androidDocFix
Added sanity data for OCL cvtColor performance test modes: YUV2RGB_IYUV, YUV2GRAY_420, RGB2YUV_IYUV, YUV2RGB_YUY2, YUV2GRAY_YUY2
Merge pull request #224 from akarsakov:ocl_cvtcolor_perf_tests
fixed upnp perf test failure
Merge pull request #225 from vpisarev:fix_upnp_perf
added regression test data for kaze/akaze
ok, removed kaze/akaze data - very weird
Merge pull request #226 from vpisarev:refactor_features2d_take4