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

Change-Id: Ia6fa87823a5e05908ab622c8d52536ac365e131f


Trivial merge