Merge branch 'master' into extended-easysetup 49/10049/1
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)
commiteabd9d6003a85cf6834ce70d78ca8c80a70445a2
treec1d5edc99b86749749850c58f0f64e4fc1e8e00f
parent0577d1432e6ee30aad229c426401d3d35c2b724e
parentb15643413083b95ed08c706a3fe1d8a83600ee83
Merge branch 'master' into extended-easysetup

Change-Id: Ica3dc6b70f2021c7f26d002ae9a0f50ea1fd82b2
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>