am f96b4224: Merge "Fix dEQP issues with identifier names with two underscores."...
authorJarkko Pöyry <jpoyry@google.com>
Tue, 11 Nov 2014 18:39:59 +0000 (18:39 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 11 Nov 2014 18:39:59 +0000 (18:39 +0000)
* commit 'f96b4224a1922b2d7661310a650bad701cfb2555':
  Fix dEQP issues with identifier names with two underscores.


Trivial merge