Merge branch 'tizen_dev' into tizen 94/72094/1
authorAndrey Klimenko <and.klimenko@samsung.com>
Mon, 30 May 2016 12:25:10 +0000 (15:25 +0300)
committerAndrey Klimenko <and.klimenko@samsung.com>
Mon, 30 May 2016 12:25:17 +0000 (15:25 +0300)
Change-Id: I6973eb3860bb8b819691dec2ea55c5399390236d
Signed-off-by: Andrey Klimenko <and.klimenko@samsung.com>

Trivial merge