Merge "Fixed IOT-110--Crash on destruction"
authorsudarshan prasad <sudarshan.prasad@intel.com>
Sat, 13 Dec 2014 01:20:04 +0000 (17:20 -0800)
committerGerrit Code Review <gerrit@oicreview.vlan14.01.org>
Sat, 13 Dec 2014 01:20:04 +0000 (17:20 -0800)

Trivial merge