am 686d77f6: am c4603330: am 2022d66b: (-s ours) am 1deb3e82: Remove few GLES3 fragda...
authorMika Isojärvi <misojarvi@google.com>
Thu, 27 Aug 2015 20:59:57 +0000 (20:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 20:59:57 +0000 (20:59 +0000)
* commit '686d77f64908e8fb5517b329140a01d991c1bc4c':


Trivial merge