tree b90eba18ff8dbebd328d1f92860d281b2757f1ac
parent 367fe2543648d7722b71cc3f7cb2369fe96571fb
parent 30b59adf32c85bf0018c08f2c6454175a6d4f417
author Louis Dionne <ldionne@apple.com> 1568748646 -0700
committer android-build-merger <android-build-merger@google.com> 1568748646 -0700

[automerger skipped] DO NOT MERGE: [libc++] Move __clamp_to_integral to <cmath>, and harden against min()/max() macros am: 7af7a63c2e am: d190f65c64 am: f0f107c222 -s ours am: b3d336063c -s ours am: c940a9b998
am: 30b59adf32

Change-Id: I157308c69de8a160b08b45caa6d2680713282d64