tree fc7df4891707e13f3e0ecb4da57b70854a3f624f
parent 703237a5b0226e98230cd85cf7f14b818df961a5
parent 9fc43358f72a581beb26532ea2cb1f2adc053758
author Elliott Hughes <enh@google.com> 1423003017 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423003017 +0000

am 9fc43358: Merge "Extra Win32 compatibility."

* commit '9fc43358f72a581beb26532ea2cb1f2adc053758':
  Extra Win32 compatibility.