Merge branch 'master' into extended-easysetup
authorHeewon Park <h_w.park@samsung.com>
Mon, 8 Aug 2016 06:08:10 +0000 (15:08 +0900)
committerHeewon Park <h_w.park@samsung.com>
Mon, 8 Aug 2016 06:08:27 +0000 (15:08 +0900)
commitc7080dd10db28cd74639df408635e9e0ff4c7cd2
treef30c81d2ddd607609f18f4d94a389c6d65d395ac
parentd2f91e300c3417e409a1bcdf8fd8c5ff347b1f09
parentc0445e36283e4dea3f0a700288037113ad1d5390
Merge branch 'master' into extended-easysetup

Change-Id: I300f1038ef9795499f328bf844939757702dcdeb
Signed-off-by: Heewon Park <h_w.park@samsung.com>