Marina Kolpakova 680a44189c merged the trunk r8704:8716		2012-06-28 16:13:29 +00:00
..
camera_activity.cpp	merged the trunk r8704:8716	2012-06-28 16:13:29 +00:00