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

Trivial merge