Handle unsupported no_config contexts am: b60ae978ad am: 307c716b4e am: 3963672fbd
authorMark Adams <marka@nvidia.com>
Wed, 7 Feb 2018 17:54:19 +0000 (17:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 7 Feb 2018 17:54:19 +0000 (17:54 +0000)
am: 3dccadb326

Change-Id: I589c72fde4d4c192491d3b2215ab89d91f613664


Trivial merge