Merge \\"DO NOT MERGE CP vertex array test and warning fixes\\" into marshmallow...
authorDaniel Xie <dxie@google.com>
Mon, 1 Aug 2016 19:43:07 +0000 (19:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 1 Aug 2016 19:43:07 +0000 (19:43 +0000)
am: 7bc41121c1

Change-Id: I4174ccb59db2b28655fd46307b9f620833f87316


Trivial merge