tree 75d4d1942bbf71e3e24e1088f624fc0ddf9608a0
parent d2ee70758627cd67c9e393f6ae7f453093a1c957
parent 2f431a8d5a1c2029af470a7336751a555131ee51
author Stephen Hines <srhines@google.com> 1412211207 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412211207 +0000

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

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