tree cc1eeb6549ced0b51c9c66dfcdda52a7f1bfbb1d
parent eb65ce0a240f9591019b8a40e17d25e86a131e35
parent 78ea165ea24e83a979939153ed4d3b075c07a779
author Elliott Hughes <enh@google.com> 1441142545 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441142545 +0000

am 78ea165e: Merge "Use O_BINARY in base/file for Windows."

* commit '78ea165ea24e83a979939153ed4d3b075c07a779':
  Use O_BINARY in base/file for Windows.