Merge branch 'tizen_3.0' into tizen 26/115126/1
authorGilbok Lee <gilbok.lee@samsung.com>
Thu, 16 Feb 2017 10:48:46 +0000 (19:48 +0900)
committerGilbok Lee <gilbok.lee@samsung.com>
Thu, 16 Feb 2017 10:48:55 +0000 (19:48 +0900)
Change-Id: I90ee06f34434297680c6ba4409162ab732c211b7


Trivial merge