tree 5e3e9467fe4bf8a3aef09d90c6f3b18be36a4a7e
parent 4c4fa1a57fcf7aaf174655532b19b813a7f43ad3
parent a866e5a8eb0d331c5970ee106cf8f5bd0903eb7c
author Stephen Hines <srhines@google.com> 1412257113 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412257113 +0000

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

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