Merge branch 'master' into extended-easysetup 85/9485/1
authorJihun Ha <jihun.ha@samsung.com>
Wed, 20 Jul 2016 02:11:15 +0000 (11:11 +0900)
committerJihun Ha <jihun.ha@samsung.com>
Wed, 20 Jul 2016 02:11:15 +0000 (11:11 +0900)
commit5ca344b5d30aa6322c89a460f9c551d5a194be83
treeb07a0e2fc0443dc8287cf494ff7dae086f52cce1
parent17a0609b2a1c91ffa40195fa9ead7d75c816c5a2
parenteade4560ff85f569db98da502a26ab603592682f
Merge branch 'master' into extended-easysetup

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