Merge nyc-dev into Khronos merge branch
authorMika Isojärvi <misojarvi@google.com>
Fri, 25 Mar 2016 19:25:41 +0000 (19:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 25 Mar 2016 19:25:41 +0000 (19:25 +0000)
commit647d8ca6ba8538cc5cee5c8b6b76a6e353ddef09
tree495a59c0e0a9a92599e32b4b2788d60c70edfa33
parentaf6c938ae4fe024e24ab6616953365915e62e2e5
parentac0c069e8505a4c1bee283c2f597221fec4e9d55
Merge nyc-dev into Khronos merge branch
am: ac0c069

* commit 'ac0c069e8505a4c1bee283c2f597221fec4e9d55':
  Allow more alternative forms of scalar reflect function
  Use supported number of atomic counters in opaque indexing tests
  Create texture in negative CompressedTexSubImage() tests