Merge "Fix extension support checks in negative api tests" into nougat-cts-dev am...
authorGraeme Leese <gleese@broadcom.com>
Thu, 24 Aug 2017 18:04:30 +0000 (18:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Aug 2017 18:04:30 +0000 (18:04 +0000)
am: 9485e519fd

Change-Id: I6b89a8388ddb627bcbdaaee6bc10ecb79470139b


Trivial merge