tree 63b6f16b34ac69c925127291d6fb6ae520b2584c
parent ff1fcd6aa78fa460a98ac78b51e070c857baf288
parent 5f192c76c7ae360132c43c35c8d0f334c3c84d60
author Ta-wei Yen <twyen@google.com> 1474586457 +0000
committer android-build-merger <android-build-merger@google.com> 1474586457 +0000

Merge "Disable MWI suppression if VVM cannot be activated" into nyc-mr1-dev
am: 5f192c76c7

Change-Id: Ibe5eb698073aca7591010497f8e3cd3513bd36fa