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

* commit '51ef8f39de376fe71ce5d2c682abe4f974cf8074':
  Fix compile error on mac 10.9
pull/91/head
Wink Saville 11 years ago committed by Android Git Automerger
commit 66ec7d4151

Diff Content Not Available