am efdc1173: Allow alternative expansion of acosh()
authorPyry Haulos <phaulos@google.com>
Fri, 10 Jul 2015 21:31:19 +0000 (21:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 Jul 2015 21:31:19 +0000 (21:31 +0000)
* commit 'efdc11737f4ca604e837bdfd8a0675e3c6c1c24f':
  Allow alternative expansion of acosh()


Trivial merge