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)
commit245bd3ffc413ac095141ea75f15a1268d49d5883
treed7263c58a35e5ef01e0cbf7c0251b1dc9aeef83c
parentb136cc9a595fdf33889737dfa87e77d1a71246b3
parentb9c3777b77e0ffa121a0041d4523c6ae14ab1dda
Merge "DO NOT MERGE CP vertex array test and warning fixes" into marshmallow-cts-dev
am: b9c3777b77  -s ours

Change-Id: I08bbe10aebbbd22e20b7fc98307be51f7629a353