Merge branch 'tizen_3.0' into tizen 72/108872/1
authorGilbok Lee <gilbok.lee@samsung.com>
Fri, 6 Jan 2017 05:47:51 +0000 (14:47 +0900)
committerGilbok Lee <gilbok.lee@samsung.com>
Fri, 6 Jan 2017 05:51:57 +0000 (14:51 +0900)
Change-Id: I5eba37e73f218e9964b6a80c5ea727bf6259a798


Trivial merge