am 70413e6e: (-s ours) am e8efb729: Relax asin() precision requirements
authorPyry Haulos <phaulos@google.com>
Thu, 27 Aug 2015 10:45:16 +0000 (10:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:45:16 +0000 (10:45 +0000)
* commit '70413e6e4b5b96f978638ff006c4e9451168aa63':


Trivial merge