Merge branch 'master' into extended-easysetup
authorJihun Ha <jihun.ha@samsung.com>
Thu, 28 Jul 2016 00:43:37 +0000 (09:43 +0900)
committerJihun Ha <jihun.ha@samsung.com>
Thu, 28 Jul 2016 00:43:37 +0000 (09:43 +0900)
Change-Id: I5853e24accda1b7652a671949c466f920e5b8a82
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>

Trivial merge