Merge "DO NOT MERGE CP vertex array test and warning fixes" into marshmallow-cts...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 19:09:29 +0000 (19:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 19:09:29 +0000 (19:09 +0000)
am: 37c812651a

Change-Id: Id88c9d305fb2cd9f63ef158b9643725dcd7f80cf


Trivial merge