Merge \"DO NOT MERGE CP vertex array test and warning fixes\" into marshmallow-cts-dev
authorJarkko Pöyry <jpoyry@google.com>
Mon, 1 Aug 2016 19:40:38 +0000 (19:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 1 Aug 2016 19:40:38 +0000 (19:40 +0000)
commit7bc41121c1e0f70abc626bdda3d46be07673087e
treec3fa922202e4a5f68d161c1e7fe3d604b4e3831f
parentf840c5347fae3a228897a7f8ebadd68b330a2331
parentb9c3777b77e0ffa121a0041d4523c6ae14ab1dda
Merge \"DO NOT MERGE CP vertex array test and warning fixes\" into marshmallow-cts-dev
am: b9c3777b77  -s ours

Change-Id: I61fdf061a9d18682387f51d22589794ca2bd2004