Merge branch 'tizen' into tizen_dev 86/75986/1
authorAndrey Klimenko <and.klimenko@samsung.com>
Wed, 22 Jun 2016 09:18:11 +0000 (12:18 +0300)
committerAndrey Klimenko <and.klimenko@samsung.com>
Wed, 22 Jun 2016 09:18:42 +0000 (12:18 +0300)
Change-Id: I90b017acf0a4a350efe293169c1a0c7f4aa609e8
Signed-off-by: Andrey Klimenko <and.klimenko@samsung.com>

Trivial merge