tree 3837d2b1de4a6285d1db902a18a2c18368ee1d49
parent 4b50cef2dd9fd18af9b94ff2e6669d52b4ce9e20
parent 0bbc7a9cf9c0bd96b932d903d6a781d8de323ea5
author Nick Kralevich <nnk@google.com> 1394592346 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394592346 +0000

am 0bbc7a9c: Maybe fix darwin compile error.

* commit '0bbc7a9cf9c0bd96b932d903d6a781d8de323ea5':
  Maybe fix darwin compile error.