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

Change-Id: Ie8fc46bf71323d08973361983006e0c4ae7ec59a


Trivial merge