Merge "Fixing OCCancel with High_QOS in observe isn't deleting CB."
authorSudarshan Prasad <sudarshan.prasad@intel.com>
Wed, 7 Jan 2015 21:22:00 +0000 (21:22 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Wed, 7 Jan 2015 21:22:00 +0000 (21:22 +0000)

Trivial merge