Merge branch 'master' into simulator 15/2715/1
authorHarish Kumara Marappa <h.marappa@samsung.com>
Fri, 18 Sep 2015 14:37:25 +0000 (20:07 +0530)
committerHarish Kumara Marappa <h.marappa@samsung.com>
Fri, 18 Sep 2015 14:37:25 +0000 (20:07 +0530)
commit042d312f286334082d9919fbc137f83aa1793d5d
tree02a100f1519703c0c01f22eb4427c6c144ec5aba
parentb196fb356a2ca6776efcc7a77eebd3e5067fb472
parent3681d1b83b5d2fdb58316250e5c43b8e58e67da0
Merge branch 'master' into simulator

Change-Id: I76a7d8c501e2122a3c4eddd73ede9f7195fe1055
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
resource/include/OCApi.h
resource/src/InProcServerWrapper.cpp
service/SConscript