merge with develop repeated.
authorDmytro Vasiliev <d.vasiliev@samsung.com>
Wed, 10 Apr 2013 16:43:24 +0000 (19:43 +0300)
committerDmytro Vasiliev <d.vasiliev@samsung.com>
Wed, 10 Apr 2013 16:43:24 +0000 (19:43 +0300)
commit451060d5b7ae2148bcdff7bc10bc9ebd7962af78
tree77ad66bb77692f62ecfe3a8035e471f1eba6a9eb
parente12cf7507e45b156c676b0cebc16db71e63b76ee
merge with develop repeated.

Change-Id: I64f1378e84599b33372fbb936a3bea898d666b25
lib/armv7-a/libarengine.so
lib/x86/libarengine.so
src/ImageRecognitionInfo.h [changed mode: 0644->0755]