Merge branch 'master' into simulator 86/1986/2
authorHarish Kumara Marappa <h.marappa@samsung.com>
Mon, 3 Aug 2015 12:29:10 +0000 (17:59 +0530)
committerHarish Kumara Marappa <h.marappa@samsung.com>
Mon, 3 Aug 2015 12:29:47 +0000 (17:59 +0530)
commit3f52e71dde4e380927a65b2d8718897b483fd3b7
tree36e6a0ebbf005dd494f9d9b4ab8ee4819dc61d8d
parente7d6bd0eb1604e7d4fbcfff7fd4a71763f25a31c
parent2ed978cb9a0d7fe9417363cc566b09dad6a3208b
Merge branch 'master' into simulator

Change-Id: Ieeef8e1039b33e8ce2d49642f3e23de24052b6b8
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
service/SConscript
service/simulator/SConscript