Merge branch 'tizen_3.0' into tizen 86/97186/1
authorGilbok Lee <gilbok.lee@samsung.com>
Fri, 11 Nov 2016 10:22:47 +0000 (19:22 +0900)
committerGilbok Lee <gilbok.lee@samsung.com>
Fri, 11 Nov 2016 10:22:54 +0000 (19:22 +0900)
Change-Id: I3431b696c6480de9b62272fd95be14323bdd4e69


Trivial merge