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:04 +0000 (22:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 4 Aug 2017 22:21:04 +0000 (22:21 +0000)
am: 3558abf238

Change-Id: I2a9cf3840c5fa7f4a004cc2c46f41a22222a4ac6


Trivial merge