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

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

Change-Id: I1f80298cd380c652564c2ee10bb168397b1468b8