Merge branch 'tizen_3.0' into tizen 58/116258/1
authorGilbok Lee <gilbok.lee@samsung.com>
Thu, 23 Feb 2017 11:34:26 +0000 (20:34 +0900)
committerGilbok Lee <gilbok.lee@samsung.com>
Thu, 23 Feb 2017 11:34:33 +0000 (20:34 +0900)
Change-Id: I74a928f48ee29a62d1eee19ea1912355814a154d


Trivial merge