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)
commitf81129ace529413df24292f1446a30d0fdf24c2b
tree24ef8644081bcbf86d8d456f02cd3fc4ed2baefb
parent6622fca961729a7bccc23ce54759b35b55c5fca9
parentba9725edbd9dccf87e8e57184e440168122b2cac
Merge changes I5acd9c57,I90e7a69e

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