Merge branch 'tizen' into tizen_app submit/tizen_app/20160314.155553
authorGennadiy Azarov <gen.azarov@samsung.com>
Mon, 14 Mar 2016 15:55:12 +0000 (17:55 +0200)
committerGennadiy Azarov <gen.azarov@samsung.com>
Mon, 14 Mar 2016 15:55:12 +0000 (17:55 +0200)

Trivial merge