Merge branch 'master' into easysetup
authorlankamadan <lanka.madan@samsung.com>
Fri, 11 Sep 2015 13:34:33 +0000 (22:34 +0900)
committerlankamadan <lanka.madan@samsung.com>
Fri, 11 Sep 2015 14:02:31 +0000 (23:02 +0900)
commit155e3a129b0d95d0179cc60f7c254910c0f0aa8e
treea124d8e2e66bdec587b19488dfeb9256a1c81492
parent5a26bc5e89375eb7cff3c119f7132cb2f77cc040
parent7aca2c89f54ea3a0ea99b543f0c179aa98bd2fa3
Merge branch 'master' into easysetup

Conflicts:
service/SConscript

Change-Id: I1c850a63fe8b10162a8861dc1f9e79269a7d0824
Signed-off-by: lankamadan <lanka.madan@samsung.com>
service/SConscript