tree 316f7fee7e23d9b6ddc15eec3e39dd19ef6c7dd7
parent 35fc8255c0470776961cd28fceb2b0261bf8d20a
parent 0c2625587b262d8dbc338f85b2ee882779e28370
author Andrew Hsieh <andrewhsieh@google.com> 1357239531 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1357239531 -0800

am 0c262558: am 6d2a832f: Merge "Sync fenv.h"

* commit '0c2625587b262d8dbc338f85b2ee882779e28370':
  Sync fenv.h