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


Trivial merge