Merge "fix darwin and ios build error"
authorErich Keane <erich.keane@intel.com>
Thu, 6 Nov 2014 01:27:53 +0000 (17:27 -0800)
committerGerrit Code Review <gerrit@oicreview.vlan14.01.org>
Thu, 6 Nov 2014 01:27:53 +0000 (17:27 -0800)
commitfaa2cccb93776abe55ebb98dd13f22f0c36385be
treea8b58bd757be4b78a8723b76acdbb77d4bf46e45
parentafeb6a979fad8fbcd58d97b3e5431f430b4729a5
parentec158fe72c120ad253dbb133b5309b98cd414798
Merge "fix darwin and ios build error"