tree 4657ab3f0bd551821ac9923897c7b983c6e1f17c
parent 490f03d560e873ad73f964815ca109381efec147
parent 2f431a8d5a1c2029af470a7336751a555131ee51
author Stephen Hines <srhines@google.com> 1412211206 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412211206 +0000

am 2f431a8d: Fix windows-specific error without messing up Makefile flags.

* commit '2f431a8d5a1c2029af470a7336751a555131ee51':
  Fix windows-specific error without messing up Makefile flags.