Merge "Merge remote branch '1.3-rel'(38203e6)"
authorAshok Babu Channa <ashok.channa@samsung.com>
Thu, 5 Oct 2017 05:26:09 +0000 (05:26 +0000)
committerAshok Babu Channa <ashok.channa@samsung.com>
Thu, 5 Oct 2017 05:26:09 +0000 (05:26 +0000)
1  2 
resource/csdk/stack/src/ocstack.c

Simple merge