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

Change-Id: Idd77a0b566540b717ea80685af6f3aae84aed0b7


Trivial merge