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

Change-Id: I80c9b1fe0131870b22c2d81d21543c59d2a3bf06


Trivial merge