Merge in bugfixes from Khronos repository
authorJeannot Breton <jbreton@nvidia.com>
Mon, 21 Mar 2016 17:49:51 +0000 (17:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 21 Mar 2016 17:49:51 +0000 (17:49 +0000)
am: 45cb571

* commit '45cb57100923ca89c36455f832398557d4877ff8':
  clamp allocation size based on heap size
  dEQP-VK.spirv_assembly.instruction.compute.*: avoid platform-dependent rounding in tests for OpCopyObjectGroup, OpPhiGroup, SelectionControlGroup and FunctionControlGroup.
  Add new --deqp-log-flush command line option


Trivial merge