Merge "Added URI parameter for Device Entity Handler."
authorErich Keane <erich.keane@intel.com>
Wed, 1 Oct 2014 00:29:36 +0000 (17:29 -0700)
committerGerrit Code Review <gerrit@oicreview.vlan14.01.org>
Wed, 1 Oct 2014 00:29:36 +0000 (17:29 -0700)
1  2 
include/OCApi.h

diff --cc include/OCApi.h
Simple merge