am 51ef8f39: Merge "Fix compile error on mac 10.9"
am 51ef8f39: Merge "Fix compile error on mac 10.9"

* commit '51ef8f39de376fe71ce5d2c682abe4f974cf8074':
  Fix compile error on mac 10.9

geekboxzone/mmallow_external_protobuf,geekboxzone/mmallow_external_protobuf,geekboxzone/mmallow_external_protobuf,geekboxzone/mmallow_external_protobuf,android-ia/platform_external_protobuf,MonkeyZZZZ/platform_external_protobuf,geekboxzone/mmallow_external_protobuf,geekboxzone/lollipop_external_protobuf,MonkeyZZZZ/platform_external_protobuf,geekboxzone/lollipop_external_protobuf,geekboxzone/lollipop_external_protobuf,android-ia/platform_external_protobuf,android-ia/platform_external_protobuf,android-ia/platform_external_protobuf,MonkeyZZZZ/platform_external_protobuf,geekboxzone/lollipop_external_protobuf,MonkeyZZZZ/platform_external_protobuf,MonkeyZZZZ/platform_external_protobuf,geekboxzone/lollipop_external_protobuf