Merge "[SSM] Apply changed OIC API"
authorUze Choi <uzchoi@samsung.com>
Mon, 15 Dec 2014 04:11:06 +0000 (20:11 -0800)
committerGerrit Code Review <gerrit@oicreview.vlan14.01.org>
Mon, 15 Dec 2014 04:11:06 +0000 (20:11 -0800)

Trivial merge