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

Trivial merge