Merge branch 'tizen_3.0' into tizen 25/96125/1
authorkiso.chang <kiso.chang@samsung.com>
Tue, 8 Nov 2016 02:28:38 +0000 (11:28 +0900)
committerkiso.chang <kiso.chang@samsung.com>
Tue, 8 Nov 2016 02:29:06 +0000 (11:29 +0900)
Change-Id: I8da262ea20be07a3718ce5c83aa9a7e40a49c1df
Signed-off-by: kiso.chang <kiso.chang@samsung.com>

Trivial merge