Merge "Remove sin/cos workaround for libhoudini" into lmp-mr1-dev
authorPyry Haulos <phaulos@google.com>
Mon, 1 Dec 2014 19:19:18 +0000 (19:19 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 1 Dec 2014 19:19:18 +0000 (19:19 +0000)

Trivial merge