Merge "MSVC: set exception handling model" am: ac343841e4
authorPyry Haulos <phaulos@google.com>
Thu, 11 Aug 2016 18:42:04 +0000 (18:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 11 Aug 2016 18:42:04 +0000 (18:42 +0000)
am: 199e67724d

Change-Id: I93fecffb48261b94c1f49f7c473acfea22fd4860


Trivial merge