Merge pull request #800 from asmorkalov:android_cam_idx_semantic

author Andrey Pavlenko <andrey.pavlenko@itseez.com>

Mon, 29 Apr 2013 06:00:07 +0000 (10:00 +0400)

committer OpenCV Buildbot <buildbot@opencv.org>

Mon, 29 Apr 2013 06:00:08 +0000 (10:00 +0400)
author Andrey Pavlenko <andrey.pavlenko@itseez.com>
Mon, 29 Apr 2013 06:00:07 +0000 (10:00 +0400)
committer OpenCV Buildbot <buildbot@opencv.org>
Mon, 29 Apr 2013 06:00:08 +0000 (10:00 +0400)
diff --cc modules/java/generator/src/java/android+CameraBridgeViewBase.java
Simple merge
diff --cc modules/java/generator/src/java/android+JavaCameraView.java
Simple merge
author	Andrey Pavlenko <andrey.pavlenko@itseez.com>
	Mon, 29 Apr 2013 06:00:07 +0000 (10:00 +0400)
committer	OpenCV Buildbot <buildbot@opencv.org>
	Mon, 29 Apr 2013 06:00:08 +0000 (10:00 +0400)
		1	2
modules/java/generator/src/java/android+CameraBridgeViewBase.java	patch \|	diff1 \|	diff2 \|	blob \| history
modules/java/generator/src/java/android+JavaCameraView.java	patch \|	diff1 \|	diff2 \|	blob \| history