tree fec6f2e0224a6d82fa831c42c81559fe38a25f61
parent 62a665a605df64a6ea5ac680bb564ad7a5f03711
parent 14538ca75ef3d0edc8fb86e332d79a4913238cb6
author Elliott Hughes <enh@google.com> 1412962191 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1412962192 +0000

Merge "Catch up on upstream's round/roundf/roundl."