Merge "DO NOT MERGE CP vertex array test and warning fixes" into marshmallow-cts...
authorDaniel Xie <dxie@google.com>
Thu, 25 Aug 2016 22:33:45 +0000 (22:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Aug 2016 22:33:45 +0000 (22:33 +0000)
am: 26f19c81f9

Change-Id: If8708e928216f83d1b4e5d6ae61a3c3060e07937


Trivial merge