am a4746e97: am 80ca4a97: am ccd6223f: am ba0bb801: am a16583a0: Merge "Fix windows/mingw build."

* commit 'a4746e977e99f897eb5c0ac6dfd066b8b707f552':
This commit is contained in:
Ying Wang 2014-05-12 23:31:11 +00:00 committed by Android Git Automerger
commit 4e815cbb09

Diff Content Not Available