Merge branch 'tizen_4.0' into tizen 53/156153/1 accepted/tizen/unified/20171017.204907 accepted/tizen/unified/20171018.165216 submit/tizen/20171017.092514 submit/tizen/20171018.024341
authorDmitry Kovalenko <d.kovalenko@samsung.com>
Tue, 17 Oct 2017 09:17:19 +0000 (12:17 +0300)
committerDmitry Kovalenko <d.kovalenko@samsung.com>
Tue, 17 Oct 2017 09:17:34 +0000 (12:17 +0300)
Change-Id: I6c9013239acb80b199f99759b85476a921bbf419


Trivial merge