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)
commit8aef8174a0af1e70f0952bf08bb9df5f14864b82
tree169f804fcbe94f04474bdfebcacd5db638654fc2
parent8180af2adfe03a809910a655914c59ede25c92c1
parent016b0075b3c0607351954914d6ee038d0d702c92
Merge branch 'master' into extended-easysetup

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