am edd21bd9: Merge "Remove sin/cos workaround for libhoudini" into lmp-mr1-dev
authorPyry Haulos <phaulos@google.com>
Mon, 1 Dec 2014 20:00:51 +0000 (20:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Dec 2014 20:00:51 +0000 (20:00 +0000)
* commit 'edd21bd9be5debea460b935fb7277aeeed606e78':
  Remove sin/cos workaround for libhoudini


Trivial merge