Merge branch 'tizen_3.0' into tizen
authorGilbok Lee <gilbok.lee@samsung.com>
Fri, 6 Jan 2017 05:12:31 +0000 (14:12 +0900)
committerGilbok Lee <gilbok.lee@samsung.com>
Fri, 6 Jan 2017 05:12:38 +0000 (14:12 +0900)
Change-Id: Ib4e1c98830b6a68734170eb23ad23eba8802b08d


Trivial merge