Merge branch 'tizen_4.0' into tizen 07/149907/1
authorAlexander Aksenov <a.aksenov@samsung.com>
Wed, 13 Sep 2017 12:40:57 +0000 (15:40 +0300)
committerAlexander Aksenov <a.aksenov@samsung.com>
Wed, 13 Sep 2017 12:41:04 +0000 (15:41 +0300)
Change-Id: I767c638d36186aaa2954425a58002dea614c639e
Signed-off-by: Alexander Aksenov <a.aksenov@samsung.com>

Trivial merge