Merge "Folks using sample apps get confused with error-prone code in samples. Fixing...
authorWilliam Dieter <william.r.dieter@intel.com>
Fri, 22 Aug 2014 18:37:26 +0000 (11:37 -0700)
committerGerrit Code Review <gerrit@oicreview.vlan14.01.org>
Fri, 22 Aug 2014 18:37:26 +0000 (11:37 -0700)

Trivial merge