Merge branch 'tizen' into 'tizen_dev'. 63/75263/1
authorEugene Kurzberg <i.kurtsberg@samsung.com>
Fri, 17 Jun 2016 07:27:11 +0000 (10:27 +0300)
committerEugene Kurzberg <i.kurtsberg@samsung.com>
Fri, 17 Jun 2016 07:27:11 +0000 (10:27 +0300)
Change-Id: Ic5819a83be8d77861815b0670a9110f293d3eaef
Signed-off-by: Eugene Kurzberg <i.kurtsberg@samsung.com>

Trivial merge