Merge branch 'tizen_4.0' into tizen 02/153902/1
authorDmitry Kovalenko <d.kovalenko@samsung.com>
Tue, 3 Oct 2017 06:28:42 +0000 (09:28 +0300)
committerDmitry Kovalenko <d.kovalenko@samsung.com>
Tue, 3 Oct 2017 06:30:03 +0000 (09:30 +0300)
Change-Id: I34ef1dec67fec6ee546ee4a5748e0a73e34e7b88


Trivial merge