Merge "Merge bug fixes from Khronos CTS release branch am: 3d8e6ee58a am: db45dfc398...
authorPyry Haulos <phaulos@google.com>
Fri, 27 May 2016 15:20:41 +0000 (15:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 27 May 2016 15:20:41 +0000 (15:20 +0000)
commitae0ecb55387f2f05b5a85114404a94cef4d15e01
treefaccc5b01994b276cbfe7fa7a856b83e546e2295
parent1bc572cd3a305ca8db8c3181ed728e41eddcf298
parent0f76157c3be15a2e7cdce0227b2a13730bca76b3
Merge "Merge bug fixes from Khronos CTS release branch am: 3d8e6ee58a am: db45dfc398" into nyc-mr1-dev-plus-aosp
am: 0f76157c3b

* commit '0f76157c3be15a2e7cdce0227b2a13730bca76b3':

Change-Id: I6c5f2db7afbe1a9aa6aceb4f674a9d228b1ccfe8