am c8a2d38b: am 0d898376: (-s ours) am b24fe40c: Merge "Remove mediump sin/cos/tan...
authorPyry Haulos <phaulos@google.com>
Thu, 27 Aug 2015 14:46:29 +0000 (14:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:46:29 +0000 (14:46 +0000)
* commit 'c8a2d38b677c388edaff6343c8306c0b756bdb94':


Trivial merge