am a4ee9d81: Merge "Enable default VAO attrib divisor test for resolved Khronos bug...
authorJarkko Pöyry <jpoyry@google.com>
Mon, 11 Jan 2016 19:40:10 +0000 (19:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:40:10 +0000 (19:40 +0000)
am: b9bb18d082

* commit 'b9bb18d0820fd416955aeb56e0cee147ab193064':


Trivial merge