tree 83cde2a3c1a04aad1a751312ce60883b77c79f1c
parent 61384bb399e6d3c29d054e956131d140d8f4caea
parent dc05ca5be2319f74b41cb429ea50f30fceff4ace
author Brian Carlstrom <bdc@google.com> 1402693403 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402693403 +0000

am dc05ca5b: Merge changes I12644a0e,Idbe25881

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