Handle unsupported no_config contexts am: b60ae978ad am: 307c716b4e am: d217b05e1c
authorMark Adams <marka@nvidia.com>
Wed, 7 Feb 2018 17:53:44 +0000 (17:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 7 Feb 2018 17:53:44 +0000 (17:53 +0000)
am: b6f119f293

Change-Id: Idce771c51e63ac558615ac2f3fe4e50ab11d1dd5


Trivial merge