Merge branch 'tizen_dev' into tizen 96/87696/1
authorAleksandr Sapozhnik <a.sapozhnik@samsung.com>
Fri, 9 Sep 2016 06:55:23 +0000 (09:55 +0300)
committerAleksandr Sapozhnik <a.sapozhnik@samsung.com>
Fri, 9 Sep 2016 06:55:30 +0000 (09:55 +0300)
Change-Id: I2f00bfda840541f534a7b251abd91cac5685cb43


Trivial merge