Merge "Active Discovery Resource Type Filtering - C SDK & App Changes only."
authorsudarshan prasad <sudarshan.prasad@intel.com>
Sat, 15 Nov 2014 18:27:20 +0000 (10:27 -0800)
committerGerrit Code Review <gerrit@oicreview.vlan14.01.org>
Sat, 15 Nov 2014 18:27:20 +0000 (10:27 -0800)

Trivial merge