From: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon, 30 Dec 2013 12:39:51 +0000 (+0400)
Subject: Merge commit 'b94963d38' into merge-2.4
X-Git-Tag: submit/tizen_ivi/20141117.190038~2^2~748^2~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=39fb8e03d71e2bd90d050ed79d5e21f89d942a18;p=profile%2Fivi%2Fopencv.git

Merge commit 'b94963d38' into merge-2.4

Conflicts:
	cmake/OpenCVGenAndroidMK.cmake
---

39fb8e03d71e2bd90d050ed79d5e21f89d942a18