Merge "Fix extension support checks in negative api tests" into nougat-cts-dev am...
authorGraeme Leese <gleese@broadcom.com>
Fri, 4 Aug 2017 22:45:12 +0000 (22:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 4 Aug 2017 22:45:12 +0000 (22:45 +0000)
am: 111e3a2323

Change-Id: Ie0c9bc999c2cebb97cb629b2822e13cbc201f87f


Trivial merge