Merge changes I5acd9c57,I90e7a69e
authorUze Choi <uzchoi@samsung.com>
Fri, 9 Jan 2015 08:16:20 +0000 (08:16 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Fri, 9 Jan 2015 08:16:20 +0000 (08:16 +0000)
* changes:
  [SSM] Fix context query parser issues
  [SSM] Add omitted arduino sample and soft sensor sample


Trivial merge