tree 25143e7c9104b3753fd7633321c7bfd8a80e12b6
parent ae5782c7b4241c1655fab78e9a69d231eb7d93f7
parent 83533a235c64a3b3cbecf152b678585f1e6b3577
author Dan Willemsen <dwillemsen@google.com> 1441127159 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441127159 +0000

am 83533a23: am 13786e28: am 60dd5d59: Merge "Remove USE_MINGW, whitelist windows modules"

* commit '83533a235c64a3b3cbecf152b678585f1e6b3577':
  Remove USE_MINGW, whitelist windows modules