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

Change-Id: I7e82cb7cec1519ac43a1d60955096e89796e35a2


Trivial merge