Merge "Fix extension support checks in negative api tests" into nougat-cts-dev am...
authorGraeme Leese <gleese@broadcom.com>
Thu, 14 Sep 2017 05:44:25 +0000 (05:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Sep 2017 05:44:25 +0000 (05:44 +0000)
am: d8c8426600

Change-Id: I14ca9ed727937431564bddaa28adf15addd9818f


Trivial merge