tree cbc858f15fcb4f5e57bc4e387be5da5703ea3996
parent 3601abb810e7e33902e461ed0386673d3be11af9
parent 4592d73e18684b8ba2addb97433eed4cf389e386
author Elliott Hughes <enh@google.com> 1408590986 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408590986 +0000

am 4592d73e: am a59b6ac6: Merge "Only the Mac doesn\'t have open_memstream."

* commit '4592d73e18684b8ba2addb97433eed4cf389e386':
  Only the Mac doesn't have open_memstream.