Merge "DO NOT MERGE CP vertex array test and warning fixes" into marshmallow-cts...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 19:04:35 +0000 (19:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 19:04:35 +0000 (19:04 +0000)
commit37c812651a13b66e72a7b4a324e3b872373e73ed
treed45289fd9ce56c6b8363d509c9ff36e528a7f5c5
parent3d10a0447f177e8481a442a83067062c506f325d
parent521f245edcb322a1f983866a99028908772d2f02
Merge "DO NOT MERGE CP vertex array test and warning fixes" into marshmallow-cts-dev am: b9c3777b77  -s ours am: 245bd3ffc4  -s ours am: 41d3ecd6bd  -s ours
am: 521f245edc  -s ours

Change-Id: Id7f3202c8d778f339e21c01c93fb70e455c8d194