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:34 +0000 (22:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 4 Aug 2017 22:14:34 +0000 (22:14 +0000)
am: 5bd0fb31a1

Change-Id: Id14e6caccfe5173661572abb58006199597a945e


Trivial merge