Merge branch 'tizen_3.0' into tizen 11/100511/1
authorEunhae Choi <eunhae1.choi@samsung.com>
Mon, 28 Nov 2016 09:57:35 +0000 (18:57 +0900)
committerEunhae Choi <eunhae1.choi@samsung.com>
Mon, 28 Nov 2016 09:58:11 +0000 (18:58 +0900)
Change-Id: Ibd5e8b1da4a1657fe9f4ea0a4e4691a66aee2d78
Signed-off-by: Eunhae Choi <eunhae1.choi@samsung.com>

Trivial merge