Merge bug fixes from Khronos CTS release branch
authorPyry Haulos <phaulos@google.com>
Fri, 27 May 2016 14:36:39 +0000 (14:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 27 May 2016 14:36:39 +0000 (14:36 +0000)
commit809bddd1e30264d10f5e118987a6f104c1ca3a10
tree2500c2c1945c2c90f870dae97677f38f6b2819e0
parent20954ce4bf0d903627828b486458bf1670fa853c
parent3d8e6ee58a6f3a7701a3e6cdc4ba9fb14b162410
Merge bug fixes from Khronos CTS release branch
am: 3d8e6ee58a

* commit '3d8e6ee58a6f3a7701a3e6cdc4ba9fb14b162410':
  Merge bug fixes from Khronos CTS release branch

Change-Id: I3101250fb37af4b1630fbf94f1dab96219e59545