Merge "Add const modifier"
authorErich Keane <erich.keane@intel.com>
Wed, 24 Sep 2014 16:20:14 +0000 (09:20 -0700)
committerGerrit Code Review <gerrit@oicreview.vlan14.01.org>
Wed, 24 Sep 2014 16:20:14 +0000 (09:20 -0700)

Trivial merge