Merge "Fixed build error"
authorPatrick Lankswert <patrick.lankswert@intel.com>
Wed, 17 Dec 2014 20:24:16 +0000 (12:24 -0800)
committerGerrit Code Review <gerrit@oicreview.vlan14.01.org>
Wed, 17 Dec 2014 20:24:16 +0000 (12:24 -0800)
commitb3a2c51b4433c8570fefa047a7ebc1df91559e12
tree99cda077bea2d9e52880efa3e0ba622d271af338
parent24c423e2cbff2b61a4544014470bba88a2b2a4bf
parentc81cf676b0d217a7684f562623548f6eff8adb48
Merge "Fixed build error"