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

Change-Id: I79289a400b489142682865c5a9f8153d2b97650f


Trivial merge