tree 20b89b817cd0182df097027e9577f6043c22130d
parent 534e996761531638eef73d414addf571b82b78aa
parent 930d8801481bf26538fa9a0ea07651fa4f063ef9
author Steven Moreland <smoreland@google.com> 1496449313 +0000
committer android-build-merger <android-build-merger@google.com> 1496449313 +0000

Merge "Move math function definitions." into oc-dev am: fb3424166b  -s ours
am: 930d880148  -s ours

Change-Id: Id20147c84a25c3be835a4299c1f9f53596323569