tree 83cde2a3c1a04aad1a751312ce60883b77c79f1c
parent ecca567340aae01466e3a84f42ec11744bb26775
parent bf0b5c8b5cbd6785bced36c99bc92ab3d9b143b1
author Brian Carlstrom <bdc@google.com> 1402698415 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402698415 +0000

am bf0b5c8b: am dc05ca5b: Merge changes I12644a0e,Idbe25881

* commit 'bf0b5c8b5cbd6785bced36c99bc92ab3d9b143b1':
  Remove obsolete sincos from stlport
  Fix sincosf -> sincosf recursion