Merge "Fix compile error"
authorErich Keane <erich.keane@intel.com>
Wed, 8 Oct 2014 20:40:24 +0000 (13:40 -0700)
committerGerrit Code Review <gerrit@oicreview.vlan14.01.org>
Wed, 8 Oct 2014 20:40:24 +0000 (13:40 -0700)
commita8bcec060f1000d9ecb514804f2d23dc9c8751d9
treefcc683ea98d060c90fad810b228ca50ffef4de25
parent7aad26a597c1201614eed6dcba99bc6db976b69e
parent4637c53d8400e54303e865e74f73cf9976ffea12
Merge "Fix compile error"