tree b1cfa670e9b604ffe5668b16ff9cfcdacac41748
parent c9b89ad0fed3666c52270a7f80984e6592b85e52
parent d1eab0ea46c7218c9997e4aa74603a62eca634ee
author Steven Moreland <smoreland@google.com> 1496362903 +0000
committer android-build-merger <android-build-merger@google.com> 1496362903 +0000

Merge "Move math function definitions." am: b5e90583ef
am: d1eab0ea46

Change-Id: Ibef05e7c0ffee8d02e49c2d4893b4fa28f153a2f