Merge branch 'tizen_3.0' into tizen 07/116807/1
authorGilbok Lee <gilbok.lee@samsung.com>
Tue, 28 Feb 2017 09:40:24 +0000 (18:40 +0900)
committerGilbok Lee <gilbok.lee@samsung.com>
Tue, 28 Feb 2017 09:40:32 +0000 (18:40 +0900)
Change-Id: I5d1302d7c77f6961271f35be6f304238b580adee


Trivial merge