Merge branch 'tizen' into tizen_dev 70/141170/1 tizen_dev
authorAleksandr Sapozhnik <a.sapozhnik@samsung.com>
Fri, 28 Jul 2017 09:56:31 +0000 (12:56 +0300)
committerAleksandr Sapozhnik <a.sapozhnik@samsung.com>
Fri, 28 Jul 2017 09:56:48 +0000 (12:56 +0300)
Change-Id: Ic0157facc5d3a623538da2bafb8d33bf69525b6a


Trivial merge