Merge branch 'tizen_dev' into tizen 15/140015/1
authorEugene Kurzberg <i.kurtsberg@samsung.com>
Fri, 21 Jul 2017 10:28:26 +0000 (13:28 +0300)
committerEugene Kurzberg <i.kurtsberg@samsung.com>
Fri, 21 Jul 2017 10:28:26 +0000 (13:28 +0300)
Change-Id: I82f0e1e6d161f2c38336450898200d9a9ca2b02e
Signed-off-by: Eugene Kurzberg <i.kurtsberg@samsung.com>

Trivial merge