tree ebd4d739215332e242fa5cba88f95c0791873d42
parent 5b0156c7103dcdc049d1a49a2d3d8150961034e6
parent fdfe53ccf53a76d3a3bd3b0bf01b5f5c81478bf2
author Stephen Hines <srhines@google.com> 1440672629 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440672629 +0000

am fdfe53cc: (-s ours) am f46082d2: am 6365c3b5: Merge "Add -Wno-error=missing-field-initializers for mingw build."

* commit 'fdfe53ccf53a76d3a3bd3b0bf01b5f5c81478bf2':