Merge branch 'tizen_3.0' into tizen 12/108912/1
authorIrfan Abdul <irfan.abdul@samsung.com>
Fri, 6 Jan 2017 07:50:56 +0000 (13:20 +0530)
committerIrfan Abdul <irfan.abdul@samsung.com>
Fri, 6 Jan 2017 07:50:56 +0000 (13:20 +0530)
Change-Id: I2af7fd9b9cd055fb179c0d1b87a664e0597d3611
Signed-off-by: Irfan Abdul <irfan.abdul@samsung.com>

Trivial merge