Merge branch 'tizen_4.0' into tizen 77/163477/1
authorAlexander Aksenov <a.aksenov@samsung.com>
Fri, 8 Dec 2017 09:44:22 +0000 (12:44 +0300)
committerAlexander Aksenov <a.aksenov@samsung.com>
Fri, 8 Dec 2017 09:44:22 +0000 (12:44 +0300)
Change-Id: I5068db0372d4ebdd960e57c92e5696355d1c2c7f


Trivial merge