Conflicts: modules/objdetect/src/hog.cpp fix android build
Attach a file by drag & drop or click to upload
