Merge remote-tracking branch 'origin/extended-easysetup'
authorJihun Ha <jihun.ha@samsung.com>
Thu, 11 Aug 2016 02:06:17 +0000 (11:06 +0900)
committerJihun Ha <jihun.ha@samsung.com>
Thu, 11 Aug 2016 02:06:17 +0000 (11:06 +0900)
Change-Id: I9d846ee6afcfa18a53081c606401ffe4b8d4d18c
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>

Trivial merge