From: Uze Choi <uzchoi@samsung.com>
Date: Fri, 9 Jan 2015 08:16:20 +0000 (+0000)
Subject: Merge changes I5acd9c57,I90e7a69e
X-Git-Tag: 1.2.0+RC1~1996
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f81129ace529413df24292f1446a30d0fdf24c2b;p=platform%2Fupstream%2Fiotivity.git

Merge changes I5acd9c57,I90e7a69e

* changes:
  [SSM] Fix context query parser issues
  [SSM] Add omitted arduino sample and soft sensor sample
---

f81129ace529413df24292f1446a30d0fdf24c2b