Merge "Merge "Merge "Fix extension support checks in negative api tests" into nougat...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Fri, 4 Aug 2017 22:52:34 +0000 (22:52 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 4 Aug 2017 22:52:34 +0000 (22:52 +0000)

Trivial merge