Merge bug fixes from Khronos CTS release branch am: 3d8e6ee58a
authorPyry Haulos <phaulos@google.com>
Fri, 27 May 2016 14:40:16 +0000 (14:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 27 May 2016 14:40:16 +0000 (14:40 +0000)
commit9a6dd53af23e1f166d719b3a23521e4e21d5d0f3
tree2500c2c1945c2c90f870dae97677f38f6b2819e0
parent12cd7c42b713e2a76d7ee3ec0230631b66b016d1
parent809bddd1e30264d10f5e118987a6f104c1ca3a10
Merge bug fixes from Khronos CTS release branch am: 3d8e6ee58a
am: 809bddd1e3

* commit '809bddd1e30264d10f5e118987a6f104c1ca3a10':
  Merge bug fixes from Khronos CTS release branch

Change-Id: I7ee6bae41a36c4fd9972696e75c60e68c627c900