Merge branch 'master' into extended-easysetup
authorJihun Ha <jihun.ha@samsung.com>
Thu, 4 Aug 2016 22:19:46 +0000 (07:19 +0900)
committerJihun Ha <jihun.ha@samsung.com>
Thu, 4 Aug 2016 22:19:46 +0000 (07:19 +0900)
Change-Id: Ica3dc6b70f2021c7f26d002ae9a0f50ea1fd82b2
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>

Trivial merge