Merge "Handle unsupported no_config contexts am: b60ae978ad am: d9829199ed am: f35ed9...
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>
Wed, 7 Feb 2018 17:44:18 +0000 (17:44 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 7 Feb 2018 17:44:18 +0000 (17:44 +0000)

Trivial merge