Merge "DO NOT MERGE CP vertex array test and warning fixes" into marshmallow-cts...
authorDaniel Xie <dxie@google.com>
Thu, 25 Aug 2016 23:40:31 +0000 (23:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Aug 2016 23:40:31 +0000 (23:40 +0000)
am: d0b2b3957f

Change-Id: I5e1998079ad6e42bc1f126ee3185ffb34e1a8e7e


Trivial merge