Merge branch 'tizen' into tizen_dev 28/92128/1
authorAleksandr Sapozhnik <a.sapozhnik@samsung.com>
Thu, 13 Oct 2016 09:46:14 +0000 (12:46 +0300)
committerAleksandr Sapozhnik <a.sapozhnik@samsung.com>
Thu, 13 Oct 2016 09:46:19 +0000 (12:46 +0300)
Change-Id: I191ad9fb229935ee3eb8c0f1a03004a4993cbf77


Trivial merge