tree 5b9570073386c170501d2c3b2a67080de3f2ccfc
parent 7fd985f2a57f8899b960269b3e508dc55597ed9c
parent a55701c0bed8cb4d968fea69f0e49d257c096c70
author Dan Willemsen <dwillemsen@google.com> 1441125435 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441125435 +0000

am a55701c0: Merge "Remove USE_MINGW, whitelist modules for windows"

* commit 'a55701c0bed8cb4d968fea69f0e49d257c096c70':
  Remove USE_MINGW, whitelist modules for windows