Merge "MSVC: set exception handling model" am: ac343841e4 am: 199e67724d am: 2aed524a...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 17:40:03 +0000 (17:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 17:40:03 +0000 (17:40 +0000)
am: 9af3b4b634

Change-Id: If1d42b10bd8d81a6c98ab3f893a8d9cb20633840


Trivial merge