Merge branch 'tizen_3.0' into tizen 15/108415/1
authorAndrey Klimenko <and.klimenko@samsung.com>
Wed, 4 Jan 2017 08:25:51 +0000 (10:25 +0200)
committerAndrey Klimenko <and.klimenko@samsung.com>
Wed, 4 Jan 2017 08:26:08 +0000 (10:26 +0200)
Change-Id: I11ea5e55fc7563a76886fa3f78750fd57063aa42
Signed-off-by: Andrey Klimenko <and.klimenko@samsung.com>

Trivial merge