Merge pull request #2832 from BRAINSia:20140605_Upstream
[profile/ivi/opencv.git] / modules / androidcamera / include /
drwxr-xr-x   ..
-rw-r--r-- 1112 camera_activity.hpp
-rw-r--r-- 2227 camera_properties.h