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

Change-Id: I3bc55d8c7271eb61c7c593505dab8e13e0b48e16


Trivial merge