Merge "Handle unsupported no_config contexts am: b60ae978ad am: d9829199ed am: f35ed9...
authorMark Adams <marka@nvidia.com>
Wed, 7 Feb 2018 17:49:47 +0000 (17:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 7 Feb 2018 17:49:47 +0000 (17:49 +0000)
am: 7d2fcf1c86

Change-Id: I801e959d90772b8d47a51c4228e65a492a370a93


Trivial merge