Merge branch 'master' into extended-easysetup 85/9485/1
authorJihun Ha <jihun.ha@samsung.com>
Wed, 20 Jul 2016 02:11:15 +0000 (11:11 +0900)
committerJihun Ha <jihun.ha@samsung.com>
Wed, 20 Jul 2016 02:11:15 +0000 (11:11 +0900)
Change-Id: Id4f075735ddb50b549d4342e6f03af3ca8889083
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>

Trivial merge