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

Change-Id: If8ee790f7bd4fefa05969d820dd46333775125df


Trivial merge