Merge "DO NOT MERGE CP vertex array test and warning fixes" into marshmallow-cts-dev
authorDaniel Xie <dxie@google.com>
Thu, 25 Aug 2016 20:52:41 +0000 (20:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Aug 2016 20:52:41 +0000 (20:52 +0000)
am: b9c3777b77  -s ours

Change-Id: I08bbe10aebbbd22e20b7fc98307be51f7629a353


Trivial merge