From: Erich Keane <erich.keane@intel.com>
Date: Fri, 10 Oct 2014 22:58:39 +0000 (-0700)
Subject: Merge "Fix type conflict"
X-Git-Tag: 0.9.0-CA-RC1~114
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=46b3fd15410faac3b2b30d4c47d55e16a2ad901e;p=contrib%2Fiotivity.git

Merge "Fix type conflict"
---

46b3fd15410faac3b2b30d4c47d55e16a2ad901e