Merge branch 'tizen_dev' into tizen 75/85675/1
authorAleksandr Sapozhnik <a.sapozhnik@samsung.com>
Fri, 26 Aug 2016 10:45:44 +0000 (13:45 +0300)
committerAleksandr Sapozhnik <a.sapozhnik@samsung.com>
Fri, 26 Aug 2016 11:05:01 +0000 (14:05 +0300)
Change-Id: I8aaf984e9c21dea267f3599d17cc7eccba8aaa93


Trivial merge