DO NOT MERGE CP vertex array test and warning fixes am: c63640e53a -s ours am: f840c...
authorJarkko Pyry <jpoyry@google.com>
Mon, 1 Aug 2016 19:45:35 +0000 (19:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 1 Aug 2016 19:45:35 +0000 (19:45 +0000)
am: 0556e60e67

Change-Id: Ic7e87a4e2f257670b0d12520a05133f8abd00416


Trivial merge