tree 7a960a4cf6908be962e3ef0a02d4dab68057ebab
parent 6093754759075d2bde1516c75b032b8b183bc60d
parent 9d748c8bf4b3b4810c6ad9dcc75322c8059c3876
author Elliott Hughes <enh@google.com> 1436464655 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436464655 +0000

am 9d748c8b: am a6241a02: Merge "Replace HAVE_WIN32_IPC with _WIN32."

* commit '9d748c8bf4b3b4810c6ad9dcc75322c8059c3876':
  Replace HAVE_WIN32_IPC with _WIN32.