Merge branch 'tizen' into tizen_dev 29/77729/1
authorIgor Olshevskyi <i.olshevskyi@samsung.com>
Thu, 30 Jun 2016 16:58:32 +0000 (19:58 +0300)
committerIgor Olshevskyi <i.olshevskyi@samsung.com>
Thu, 30 Jun 2016 16:59:04 +0000 (19:59 +0300)
Change-Id: Ib4cad78e34a045400075762e8a19aadd02bcdaf3


Trivial merge