Merge "Avoid redefine 'NDEBUG'"
authorErich Keane <erich.keane@intel.com>
Thu, 18 Sep 2014 16:49:22 +0000 (09:49 -0700)
committerGerrit Code Review <gerrit@oicreview.vlan14.01.org>
Thu, 18 Sep 2014 16:49:22 +0000 (09:49 -0700)

Trivial merge