Merge "DO NOT MERGE CP vertex array test and warning fixes" into marshmallow-cts...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 20:11:43 +0000 (20:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 20:11:43 +0000 (20:11 +0000)
commit28c0fa6be6216029f95bcfe101748b784a308e31
tree31695586bf4208aa8c39b4f932b0821f291ff26f
parent7abaac90df1f4c36df4c0cd640903d32863b08b0
parentc88d2140225d75a9fdd94f8c87f14cb8e30af30a
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 am: 37c812651a
am: c88d214022  -s ours

Change-Id: Id95cd8b06d15482f4c69f1ae56a769f3c7fb1b0a