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

Change-Id: I9bac6748b66744cccf998ee698f4f4b04e69e961


Trivial merge