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

Change-Id: I377b70ad3957a5f70de43b646aacf6264d88b97a


Trivial merge