Merge branch 'tizen' into tizen_dev 56/71656/1
authorIgor Olshevskyi <i.olshevskyi@samsung.com>
Thu, 26 May 2016 10:13:50 +0000 (13:13 +0300)
committerIgor Olshevskyi <i.olshevskyi@samsung.com>
Thu, 26 May 2016 10:14:45 +0000 (13:14 +0300)
Change-Id: I1a2cf899a49dccaa42ea8eefd6c4384d4090781c


Trivial merge