Merge "Fix failed unit tests for CSDK stack."
authorSudarshan Prasad <sudarshan.prasad@intel.com>
Mon, 12 Jan 2015 20:03:15 +0000 (20:03 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Mon, 12 Jan 2015 20:03:15 +0000 (20:03 +0000)

Trivial merge