Fix ambiguous mediump int write in shared_var.atomic tests
authorPyry Haulos <phaulos@google.com>
Thu, 20 Nov 2014 21:17:15 +0000 (21:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 20 Nov 2014 21:17:15 +0000 (21:17 +0000)
automerge: 75be7fa

* commit '75be7fae1949a801c080530de53bdf123abb517a':
  Fix ambiguous mediump int write in shared_var.atomic tests


Trivial merge