roll back
Merge branch 'master' of https://github.com/BorisVasilyev/DriveAssist

Conflicts:
	RecognitionTest/Debug/RecognitionTest.log
	RecognitionTest/ProhibitedSignFinder.cpp
	RecognitionTest/RecognitionTest.cpp
	RecognitionTest/RecognitionTest.vcxproj
	RecognitionTest/RecognitionTest.vcxproj.filters
	RecognitionTest/Release/RecognitionTest.exe.intermediate.manifest
	RecognitionTest/Release/RecognitionTest.lastbuildstate
	RecognitionTest/Release/RecognitionTest.log
	RecognitionTest/SignFinderMLP.cpp
	RecognitionTest/SignFinderMLP.h
	RecognitionTest/VideoSequenceProcess.h
	res/libs/ffmpeg-1.0-android-arm/COPYING.GPLv2
	res/libs/ffmpeg-1.0-android-arm/COPYING.GPLv3
	res/libs/ffmpeg-1.0-android-arm/COPYING.LGPLv2.1
	res/libs/ffmpeg-1.0-android-arm/COPYING.LGPLv3
	res/libs/ffmpeg-1.0-android-arm/LICENSE
	res/libs/ffmpeg-1.0-android-arm/ffmpeg-android-20121013.patch
	res/libs/ffmpeg-1.0-android-arm/include/libavcodec/avcodec.h
	res/libs/ffmpeg-1.0-android-arm/include/libavcodec/avfft.h
	res/libs/ffmpeg-1.0-android-arm/include/libavcodec/dxva2.h
	res/libs/ffmpeg-1.0-android-arm/include/libavcodec/old_codec_ids.h
	res/libs/ffmpeg-1.0-android-arm/include/libavcodec/vaapi.h
	res/libs/ffmpeg-1.0-android-arm/include/libavcodec/vda.h
	res/libs/ffmpeg-1.0-android-arm/include/libavcodec/vdpau.h
	res/libs/ffmpeg-1.0-android-arm/include/libavcodec/version.h
	res/libs/ffmpeg-1.0-android-arm/include/libavcodec/xvmc.h
	res/libs/ffmpeg-1.0-android-arm/include/libavdevice/avdevice.h
	res/libs/ffmpeg-1.0-android-arm/include/libavdevice/version.h
	res/libs/ffmpeg-1.0-android-arm/include/libavfilter/asrc_abuffer.h
	res/libs/ffmpeg-1.0-android-arm/include/libavfilter/avcodec.h
	res/libs/ffmpeg-1.0-android-arm/include/libavfilter/avfilter.h
	res/libs/ffmpeg-1.0-android-arm/include/libavfilter/avfiltergraph.h
	res/libs/ffmpeg-1.0-android-arm/include/libavfilter/buffersink.h
	res/libs/ffmpeg-1.0-android-arm/include/libavfilter/buffersrc.h
	res/libs/ffmpeg-1.0-android-arm/include/libavfilter/version.h
	res/libs/ffmpeg-1.0-android-arm/include/libavfilter/vsrc_buffer.h
	res/libs/ffmpeg-1.0-android-arm/include/libavformat/avformat.h
	res/libs/ffmpeg-1.0-android-arm/include/libavformat/avio.h
	res/libs/ffmpeg-1.0-android-arm/include/libavformat/version.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/adler32.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/aes.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/attributes.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/audio_fifo.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/audioconvert.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/avassert.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/avconfig.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/avstring.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/avutil.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/base64.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/blowfish.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/bprint.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/bswap.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/common.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/cpu.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/crc.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/dict.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/error.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/eval.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/fifo.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/file.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/imgutils.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/intfloat.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/intfloat_readwrite.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/intreadwrite.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/lfg.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/log.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/lzo.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/mathematics.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/md5.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/mem.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/opt.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/parseutils.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/pixdesc.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/pixfmt.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/random_seed.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/rational.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/samplefmt.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/sha.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/time.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/timecode.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/timestamp.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/version.h
	res/libs/ffmpeg-1.0-android-arm/include/libavutil/xtea.h
	res/libs/ffmpeg-1.0-android-arm/include/libpostproc/postprocess.h
	res/libs/ffmpeg-1.0-android-arm/include/libswresample/swresample.h
	res/libs/ffmpeg-1.0-android-arm/include/libswscale/swscale.h
	res/libs/ffmpeg-1.0-android-arm/include/libswscale/version.h
	res/libs/ffmpeg-1.0-android-arm/libs/armeabi-v7a/libavcodec.so
	res/libs/ffmpeg-1.0-android-arm/libs/armeabi-v7a/libavdevice.so
	res/libs/ffmpeg-1.0-android-arm/libs/armeabi-v7a/libavfilter.so
	res/libs/ffmpeg-1.0-android-arm/libs/armeabi-v7a/libavformat.so
	res/libs/ffmpeg-1.0-android-arm/libs/armeabi-v7a/libavutil.so
	res/libs/ffmpeg-1.0-android-arm/libs/armeabi-v7a/libpostproc.so
	res/libs/ffmpeg-1.0-android-arm/libs/armeabi-v7a/libswresample.so
	res/libs/ffmpeg-1.0-android-arm/libs/armeabi-v7a/libswscale.so
	res/libs/ffmpeg-1.0-android-arm/libs/armeabi/libavcodec.so
	res/libs/ffmpeg-1.0-android-arm/libs/armeabi/libavdevice.so
	res/libs/ffmpeg-1.0-android-arm/libs/armeabi/libavfilter.so
	res/libs/ffmpeg-1.0-android-arm/libs/armeabi/libavformat.so
	res/libs/ffmpeg-1.0-android-arm/libs/armeabi/libavutil.so
	res/libs/ffmpeg-1.0-android-arm/libs/armeabi/libpostproc.so
	res/libs/ffmpeg-1.0-android-arm/libs/armeabi/libswresample.so
	res/libs/ffmpeg-1.0-android-arm/libs/armeabi/libswscale.so
	res/libs/javacv-bin/samples/BlobDemo.java
	res/libs/javacv-bin/samples/FaceApplet.html
	res/libs/javacv-bin/samples/FaceApplet.java
	res/libs/javacv-bin/samples/FaceApplet.jnlp
	res/libs/javacv-bin/samples/FacePreview.java
	res/libs/javacv-bin/samples/FaceRecognition.java
	res/libs/javacv-bin/samples/HoughLines.java
	res/libs/javacv-bin/samples/MotionDetector.java
	res/libs/opencv-2.4.3-android-arm/include/opencv2/nonfree/features2d.hpp
	res/libs/opencv-2.4.3-android-arm/include/opencv2/nonfree/nonfree.hpp
	res/libs/opencv-2.4.3-android-arm/include/opencv2/opencv_modules.hpp
	res/libs/opencv-2.4.3-android-arm/libs/armeabi-v7a/libopencv_calib3d.so
	res/libs/opencv-2.4.3-android-arm/libs/armeabi-v7a/libopencv_contrib.so
	res/libs/opencv-2.4.3-android-arm/libs/armeabi-v7a/libopencv_core.so
	res/libs/opencv-2.4.3-android-arm/libs/armeabi-v7a/libopencv_features2d.so
	res/libs/opencv-2.4.3-android-arm/libs/armeabi-v7a/libopencv_flann.so
	res/libs/opencv-2.4.3-android-arm/libs/armeabi-v7a/libopencv_highgui.so
	res/libs/opencv-2.4.3-android-arm/libs/armeabi-v7a/libopencv_imgproc.so
	res/libs/opencv-2.4.3-android-arm/libs/armeabi-v7a/libopencv_legacy.so
	res/libs/opencv-2.4.3-android-arm/libs/armeabi-v7a/libopencv_ml.so
	res/libs/opencv-2.4.3-android-arm/libs/armeabi-v7a/libopencv_nonfree.so
	res/libs/opencv-2.4.3-android-arm/libs/armeabi-v7a/libopencv_objdetect.so
	res/libs/opencv-2.4.3-android-arm/libs/armeabi-v7a/libopencv_photo.so
	res/libs/opencv-2.4.3-android-arm/libs/armeabi-v7a/libopencv_stitching.so
	res/libs/opencv-2.4.3-android-arm/libs/armeabi-v7a/libopencv_ts.so
	res/libs/opencv-2.4.3-android-arm/libs/armeabi-v7a/libopencv_video.so
	res/libs/opencv-2.4.3-android-arm/libs/armeabi-v7a/libopencv_videostab.so
	res/libs/opencv-2.4.3-android-arm/libs/armeabi/libopencv_calib3d.so
	res/libs/opencv-2.4.3-android-arm/libs/armeabi/libopencv_contrib.so
	res/libs/opencv-2.4.3-android-arm/libs/armeabi/libopencv_core.so
	res/libs/opencv-2.4.3-android-arm/libs/armeabi/libopencv_features2d.so
	res/libs/opencv-2.4.3-android-arm/libs/armeabi/libopencv_flann.so
	res/libs/opencv-2.4.3-android-arm/libs/armeabi/libopencv_highgui.so
	res/libs/opencv-2.4.3-android-arm/libs/armeabi/libopencv_imgproc.so
	res/libs/opencv-2.4.3-android-arm/libs/armeabi/libopencv_legacy.so
	res/libs/opencv-2.4.3-android-arm/libs/armeabi/libopencv_ml.so
	res/libs/opencv-2.4.3-android-arm/libs/armeabi/libopencv_nonfree.so
	res/libs/opencv-2.4.3-android-arm/libs/armeabi/libopencv_objdetect.so
	res/libs/opencv-2.4.3-android-arm/libs/armeabi/libopencv_photo.so
	res/libs/opencv-2.4.3-android-arm/libs/armeabi/libopencv_stitching.so
	res/libs/opencv-2.4.3-android-arm/libs/armeabi/libopencv_ts.so
	res/libs/opencv-2.4.3-android-arm/libs/armeabi/libopencv_video.so
	res/libs/opencv-2.4.3-android-arm/libs/armeabi/libopencv_videostab.so
	res/libs/opencv-2.4.3-android-arm/license.txt
	res/libs/opencv-2.4.3-android-arm/opencv-android-20121103.patch
	src/android/CameraServiceTest/.classpath
	src/android/CameraServiceTest/.project
	src/android/CameraServiceTest/AndroidManifest.xml
	src/android/CameraServiceTest/bin/AndroidManifest.xml
	src/android/CameraServiceTest/gen/com/example/cameraservicetest/BuildConfig.java
	src/android/CameraServiceTest/gen/com/example/cameraservicetest/R.java
	src/android/CameraServiceTest/proguard-project.txt
	src/android/CameraServiceTest/project.properties
	src/android/CameraServiceTest/res/layout/activity_main.xml
	src/android/CameraServiceTest/res/layout/dummy_preview.xml
	src/android/CameraServiceTest/res/menu/activity_main.xml
	src/android/CameraServiceTest/res/values/strings.xml
	src/android/CameraServiceTest/src/com/example/cameraservicetest/CameraPreview.java
	src/android/CameraServiceTest/src/com/example/cameraservicetest/CameraRecordService.java
	src/android/CameraServiceTest/src/com/example/cameraservicetest/MainActivity.java
	src/android/DirectoryPicker/bin/R.txt
	src/android/DirectoryPicker/gen/net/bgreco/R.java
	src/android/DirectoryPicker/res/layout/chooser_list.xml
	src/android/DirectoryPicker/res/layout/list_item.xml
	src/android/DirectoryPicker/res/values-ru/strings.xml
	src/android/DirectoryPicker/res/values/strings.xml
	src/android/DirectoryPicker/src/net/bgreco/DirectoryPicker.java
	src/android/DrivingAssistantCam/AndroidManifest.xml
	src/android/DrivingAssistantCam/bin/AndroidManifest.xml
	src/android/DrivingAssistantCam/bin/R.txt
	src/android/DrivingAssistantCam/gen/com/driveassist/drivingassistantcam/R.java
	src/android/DrivingAssistantCam/gen/net/bgreco/R.java
	src/android/DrivingAssistantCam/res/layout-land/activity_main_menu.xml
	src/android/DrivingAssistantCam/res/layout-land/activity_settings.xml
	src/android/DrivingAssistantCam/res/layout-land/activity_video.xml
	src/android/DrivingAssistantCam/res/layout-land/activity_video_list.xml
	src/android/DrivingAssistantCam/res/layout-land/dialog_first_start.xml
	src/android/DrivingAssistantCam/res/layout-land/videolist_item.xml
	src/android/DrivingAssistantCam/res/layout-large-land/activity_main_menu.xml
	src/android/DrivingAssistantCam/res/layout-large-land/activity_settings.xml
	src/android/DrivingAssistantCam/res/layout-large-land/activity_video.xml
	src/android/DrivingAssistantCam/res/layout-large-land/activity_video_list.xml
	src/android/DrivingAssistantCam/res/layout-large-land/dialog_change_space.xml
	src/android/DrivingAssistantCam/res/layout-large-land/dialog_first_start.xml
	src/android/DrivingAssistantCam/res/layout-large-land/videolist_item.xml
	src/android/DrivingAssistantCam/res/layout-large/activity_main_menu.xml
	src/android/DrivingAssistantCam/res/layout-large/activity_settings.xml
	src/android/DrivingAssistantCam/res/layout-large/activity_video_list.xml
	src/android/DrivingAssistantCam/res/layout-large/dialog_change_space.xml
	src/android/DrivingAssistantCam/res/layout-large/dialog_first_start.xml
	src/android/DrivingAssistantCam/res/layout-large/videolist_item.xml
	src/android/DrivingAssistantCam/res/layout-normal-land/activity_main_menu.xml
	src/android/DrivingAssistantCam/res/layout-normal-land/activity_settings.xml
	src/android/DrivingAssistantCam/res/layout-normal-land/activity_video.xml
	src/android/DrivingAssistantCam/res/layout-normal-land/activity_video_list.xml
	src/android/DrivingAssistantCam/res/layout-normal-land/dialog_change_space.xml
	src/android/DrivingAssistantCam/res/layout-normal-land/dialog_first_start.xml
	src/android/DrivingAssistantCam/res/layout-normal-land/videolist_item.xml
	src/android/DrivingAssistantCam/res/layout-normal/activity_main_menu.xml
	src/android/DrivingAssistantCam/res/layout-normal/activity_settings.xml
	src/android/DrivingAssistantCam/res/layout-normal/activity_video_list.xml
	src/android/DrivingAssistantCam/res/layout-normal/dialog_change_space.xml
	src/android/DrivingAssistantCam/res/layout-normal/dialog_first_start.xml
	src/android/DrivingAssistantCam/res/layout-normal/videolist_item.xml
	src/android/DrivingAssistantCam/res/layout-small-land/activity_main_menu.xml
	src/android/DrivingAssistantCam/res/layout-small-land/activity_settings.xml
	src/android/DrivingAssistantCam/res/layout-small-land/activity_video.xml
	src/android/DrivingAssistantCam/res/layout-small-land/activity_video_list.xml
	src/android/DrivingAssistantCam/res/layout-small-land/dialog_change_space.xml
	src/android/DrivingAssistantCam/res/layout-small-land/dialog_first_start.xml
	src/android/DrivingAssistantCam/res/layout-small-land/videolist_item.xml
	src/android/DrivingAssistantCam/res/layout-small/activity_main_menu.xml
	src/android/DrivingAssistantCam/res/layout-small/activity_settings.xml
	src/android/DrivingAssistantCam/res/layout-small/activity_video_list.xml
	src/android/DrivingAssistantCam/res/layout-small/dialog_change_space.xml
	src/android/DrivingAssistantCam/res/layout-small/dialog_first_start.xml
	src/android/DrivingAssistantCam/res/layout-small/videolist_item.xml
	src/android/DrivingAssistantCam/res/layout-xlarge-land/activity_main_menu.xml
	src/android/DrivingAssistantCam/res/layout-xlarge-land/activity_settings.xml
	src/android/DrivingAssistantCam/res/layout-xlarge-land/activity_video.xml
	src/android/DrivingAssistantCam/res/layout-xlarge-land/activity_video_list.xml
	src/android/DrivingAssistantCam/res/layout-xlarge-land/dialog_change_space.xml
	src/android/DrivingAssistantCam/res/layout-xlarge-land/dialog_first_start.xml
	src/android/DrivingAssistantCam/res/layout-xlarge-land/videolist_item.xml
	src/android/DrivingAssistantCam/res/layout-xlarge/activity_main_menu.xml
	src/android/DrivingAssistantCam/res/layout-xlarge/activity_settings.xml
	src/android/DrivingAssistantCam/res/layout-xlarge/activity_video_list.xml
	src/android/DrivingAssistantCam/res/layout-xlarge/dialog_change_space.xml
	src/android/DrivingAssistantCam/res/layout-xlarge/dialog_first_start.xml
	src/android/DrivingAssistantCam/res/layout-xlarge/videolist_item.xml
	src/android/DrivingAssistantCam/res/layout/activity_main_menu.xml
	src/android/DrivingAssistantCam/res/layout/activity_settings.xml
	src/android/DrivingAssistantCam/res/layout/activity_video.xml
	src/android/DrivingAssistantCam/res/layout/activity_video_list.xml
	src/android/DrivingAssistantCam/res/layout/dialog_first_start.xml
	src/android/DrivingAssistantCam/res/layout/videolist_item.xml
	src/android/DrivingAssistantCam/res/menu/activity_directory_picker.xml
	src/android/DrivingAssistantCam/res/menu/activity_main_menu.xml
	src/android/DrivingAssistantCam/res/menu/activity_video_list.xml
	src/android/DrivingAssistantCam/res/values-ru-v11/styles.xml
	src/android/DrivingAssistantCam/res/values-ru-v14/styles.xml
	src/android/DrivingAssistantCam/res/values-ru/ids.xml
	src/android/DrivingAssistantCam/res/values-ru/strings.xml
	src/android/DrivingAssistantCam/res/values/ids.xml
	src/android/DrivingAssistantCam/res/values/strings.xml
	src/android/DrivingAssistantCam/res/xml/pref_data_sync.xml
	src/android/DrivingAssistantCam/res/xml/pref_general.xml
	src/android/DrivingAssistantCam/res/xml/pref_headers.xml
	src/android/DrivingAssistantCam/res/xml/pref_notification.xml
	src/android/DrivingAssistantCam/src/com/driveassist/drivingassistantcam/CameraSurfaceView.java
	src/android/DrivingAssistantCam/src/com/driveassist/drivingassistantcam/ChangeMaxSpaceDialogFragment.java
	src/android/DrivingAssistantCam/src/com/driveassist/drivingassistantcam/FirstStartDialogFragment.java
	src/android/DrivingAssistantCam/src/com/driveassist/drivingassistantcam/GpsDisabledDialogFragment.java
	src/android/DrivingAssistantCam/src/com/driveassist/drivingassistantcam/MainMenuActivity.java
	src/android/DrivingAssistantCam/src/com/driveassist/drivingassistantcam/SelectVideoSizeDialogFragment.java
	src/android/DrivingAssistantCam/src/com/driveassist/drivingassistantcam/SettingsActivity.java
	src/android/DrivingAssistantCam/src/com/driveassist/drivingassistantcam/VideoActivity.java
	src/android/DrivingAssistantCam/src/com/driveassist/drivingassistantcam/VideoListActivity.java
	src/android/DrivingAssistantCam/src/com/driveassist/drivingassistantcam/VideoListAdapter.java
	src/android/DrivingAssistantCam/src/com/driveassist/drivingassistantcam/VideoListItem.java