tree d7263c58a35e5ef01e0cbf7c0251b1dc9aeef83c
parent b136cc9a595fdf33889737dfa87e77d1a71246b3
parent b9c3777b77e0ffa121a0041d4523c6ae14ab1dda
author Daniel Xie <dxie@google.com> 1472158361 +0000
committer android-build-merger <android-build-merger@google.com> 1472158361 +0000

Merge "DO NOT MERGE CP vertex array test and warning fixes" into marshmallow-cts-dev
am: b9c3777b77  -s ours

Change-Id: I08bbe10aebbbd22e20b7fc98307be51f7629a353