Merge "DO NOT MERGE CP vertex array test and warning fixes" into marshmallow-cts...
authorDaniel Xie <dxie@google.com>
Thu, 25 Aug 2016 23:16:34 +0000 (23:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Aug 2016 23:16:34 +0000 (23:16 +0000)
commitd0b2b3957f48c50ab582056c4434989ebe34bdde
tree3a0a510bd86b282036f6603b039ccf35a517648a
parent1465834a6f12af4c28d6799bb95b90fce83e17cc
parent0e802c4e0e0cece94310723452007d6b929c3d7c
Merge "DO NOT MERGE CP vertex array test and warning fixes" into marshmallow-cts-dev am: b9c3777b77  -s ours am: 245bd3ffc4  -s ours am: 26f19c81f9 am: a39ebfe9c3
am: 0e802c4e0e

Change-Id: I31ae7a7c36335ae75c48e50ec5a7096dc43e6acc