Merge branch 'tizen' into tizen_dev 11/94211/1
authorEugene Kurzberg <i.kurtsberg@samsung.com>
Thu, 27 Oct 2016 12:40:19 +0000 (15:40 +0300)
committerEugene Kurzberg <i.kurtsberg@samsung.com>
Thu, 27 Oct 2016 12:40:19 +0000 (15:40 +0300)
Change-Id: Ib00f6a29133de9e412d3e03c9f4db3a531ea2367
Signed-off-by: Eugene Kurzberg <i.kurtsberg@samsung.com>

Trivial merge