Merge "Partial Implementation of US1574:"
authorErich Keane <erich.keane@intel.com>
Tue, 16 Sep 2014 20:58:10 +0000 (13:58 -0700)
committerGerrit Code Review <gerrit@oicreview.vlan14.01.org>
Tue, 16 Sep 2014 20:58:10 +0000 (13:58 -0700)
1  2 
include/OCApi.h

diff --cc include/OCApi.h
Simple merge