Louis Dionne
f0f107c222
DO NOT MERGE: [libc++] Move __clamp_to_integral to <cmath>, and harden against min()/max() macros am: 7af7a63c2e
...
am: d190f65c64
Change-Id: If4680e91b42c8d183de0b7e15a9b682f3efa7fb5
2019-09-17 12:06:24 -07:00
Louis Dionne
c3a80bd37a
DO NOT MERGE: [libc++] Add __truncating_cast for safely casting float types to integers am: 55b6136b3a
...
am: 9546d85a3d
Change-Id: I48b42cca42e5a4eeb763de585b72cb0dfb854cd7
2019-09-17 12:06:21 -07:00
Dan Albert
8449105f92
DO NOT MERGE: Fix bug in random.
...
am: 4151c1e35a
Change-Id: I49f7617ddb21955b7f7c8ea2fba95f46eb7b2fc8
2019-09-17 12:01:10 -07:00
Louis Dionne
d190f65c64
DO NOT MERGE: [libc++] Move __clamp_to_integral to <cmath>, and harden against min()/max() macros
...
am: 7af7a63c2e
Change-Id: I2e4e0cdbbfa903ab8785f6d71f1afd0468cd1394
2019-09-17 12:01:07 -07:00
Louis Dionne
9546d85a3d
DO NOT MERGE: [libc++] Add __truncating_cast for safely casting float types to integers
...
am: 55b6136b3a
Change-Id: I621f34d4fdde4ddcf2ca2083e0ab524428e2e188
2019-09-17 12:01:04 -07:00
Dan Albert
12ab1636f7
[automerger skipped] DO NOT MERGE: Fix bug in random. am: 188246de28 -s ours am: f7c9cee159 -s ours am: 5d8e33dc3b am: abb6e0eaea am: f88480735b
...
am: f3473626c2 -s ours
am skip reason: subject contains skip directive
Change-Id: Ia497ce5a7fa988fbe7bc6356ab9677d6adb4e721
2019-09-16 13:39:49 -07:00
Dan Albert
3d04aec575
[automerger skipped] DO NOT MERGE: Fix bug in random. am: 188246de28 -s ours am: f7c9cee159 -s ours am: 5d8e33dc3b am: abb6e0eaea am: d4c0159f1a
...
am: 95880ab934 -s ours
am skip reason: subject contains skip directive
Change-Id: I532dd1e75c51ede3ed3f6d50a41395befe42a444
2019-09-16 13:39:35 -07:00
Dan Albert
f3473626c2
[automerger skipped] DO NOT MERGE: Fix bug in random. am: 188246de28 -s ours am: f7c9cee159 -s ours am: 5d8e33dc3b am: abb6e0eaea
...
am: f88480735b
Change-Id: Ie689be53f3b7d96af2abb82be073f5debf59bab5
2019-09-16 13:33:41 -07:00
Dan Albert
95880ab934
[automerger skipped] DO NOT MERGE: Fix bug in random. am: 188246de28 -s ours am: f7c9cee159 -s ours am: 5d8e33dc3b am: abb6e0eaea
...
am: d4c0159f1a
Change-Id: Ib635525612c6f3397e8a446121a21fa9ccb0afa9
2019-09-16 13:32:20 -07:00
Dan Albert
f88480735b
[automerger skipped] DO NOT MERGE: Fix bug in random. am: 188246de28 -s ours am: f7c9cee159 -s ours am: 5d8e33dc3b
...
am: abb6e0eaea
Change-Id: I58ae41b7f088068cebd863aab5b3868bb7b302fe
2019-09-16 13:26:27 -07:00
Dan Albert
d4c0159f1a
[automerger skipped] DO NOT MERGE: Fix bug in random. am: 188246de28 -s ours am: f7c9cee159 -s ours am: 5d8e33dc3b
...
am: abb6e0eaea
Change-Id: I036cf1841296a8d3541f85ddf6b6af791e9c04cb
2019-09-16 13:26:27 -07:00
Dan Albert
abb6e0eaea
[automerger skipped] DO NOT MERGE: Fix bug in random. am: 188246de28 -s ours am: f7c9cee159 -s ours
...
am: 5d8e33dc3b
Change-Id: Icf03abb8c5e14be613898fbcc337fbebf87de18f
2019-09-16 13:19:26 -07:00
Dan Albert
5d8e33dc3b
[automerger skipped] DO NOT MERGE: Fix bug in random. am: 188246de28 -s ours
...
am: f7c9cee159 -s ours
am skip reason: subject contains skip directive
Change-Id: I1f741eee132b134939cee8a66f5558d9be4af7f8
2019-09-16 13:13:04 -07:00
Dan Albert
f7c9cee159
[automerger skipped] DO NOT MERGE: Fix bug in random.
...
am: 188246de28 -s ours
am skip reason: subject contains skip directive
Change-Id: Id9f19c6cb973bd6313772dc0edbe0f5f7f648f31
2019-09-16 13:07:04 -07:00
Dan Albert
64b5f6a044
Merge changes from topic "am-a22da6d2f5a54df7a9f6527df4024cf9" into qt-qpr1-dev-plus-aosp
...
am: f24b33af00
Change-Id: Ica24a29c26149de2bc8722eca882595b9180358f
2019-09-16 12:55:07 -07:00
Dan Albert
3863333dcc
[automerger skipped] DO NOT MERGE: Fix bug in random. am: 01ed1e9c7b -s ours am: 4c056ce646 am: 7858a1bf96 am: ad802fbf1f
...
am: cfb266803e -s ours
am skip reason: subject contains skip directive
Change-Id: I02c84b6e8bfd7f9b55fbd289817164066ebbbebc
2019-09-16 12:55:01 -07:00
Dan Albert
afa0427814
Merge changes I71708114,Ice92a8ea,Icc81b5f6 into pi-dev am: 74bbe171bb am: 8e233cb5c6 am: 11569624aa am: f2239112f1
...
am: 7309dd9c9b
Change-Id: I78271b1eee2c1234bae332cac7bf8d56cec64d54
2019-09-16 12:54:35 -07:00
Dan Albert
db5397aad5
[automerger skipped] DO NOT MERGE: Fix bug in random. am: 01ed1e9c7b -s ours am: 4c056ce646 am: 7858a1bf96 am: 6206713fe8
...
am: 225fcd51d5 -s ours
am skip reason: subject contains skip directive
Change-Id: I5a783bed03769e0e2b316b92515bb6aa54e2b7f1
2019-09-16 12:54:30 -07:00
Android Build Merger (Role)
f24b33af00
Merge changes from topic "am-a22da6d2f5a54df7a9f6527df4024cf9" into qt-qpr1-dev-plus-aosp
...
* changes:
Merge changes I71708114,Ice92a8ea,Icc81b5f6 into pi-dev am: 74bbe171bb am: 8e233cb5c6 am: 11569624aa am: df33d93cca
[automerger skipped] DO NOT MERGE: Fix bug in random. am: 01ed1e9c7b -s ours am: 4c056ce646 am: 7858a1bf96 am: ad802fbf1f
2019-09-16 19:48:54 +00:00
Dan Albert
d5604cec74
Merge changes I71708114,Ice92a8ea,Icc81b5f6 into pi-dev am: 74bbe171bb am: 8e233cb5c6 am: 11569624aa
...
am: df33d93cca
Change-Id: I96aa9c9749407b88f022e0bcbe0034475937d7bd
2019-09-16 12:48:36 -07:00
Dan Albert
7309dd9c9b
Merge changes I71708114,Ice92a8ea,Icc81b5f6 into pi-dev am: 74bbe171bb am: 8e233cb5c6 am: 11569624aa
...
am: f2239112f1
Change-Id: I22d8d6a7c9a641b5d829c98178fcaed15ef4bfec
2019-09-16 12:48:35 -07:00
Dan Albert
cfb266803e
[automerger skipped] DO NOT MERGE: Fix bug in random. am: 01ed1e9c7b -s ours am: 4c056ce646 am: 7858a1bf96
...
am: ad802fbf1f
Change-Id: I76964bb3ce886d0d12018f75e1301f7fc0ef281e
2019-09-16 12:48:31 -07:00
Dan Albert
225fcd51d5
[automerger skipped] DO NOT MERGE: Fix bug in random. am: 01ed1e9c7b -s ours am: 4c056ce646 am: 7858a1bf96
...
am: 6206713fe8
Change-Id: I8579b9be0f51a639d1356fe9b4071a49c213d588
2019-09-16 12:48:30 -07:00
Dan Albert
df33d93cca
Merge changes I71708114,Ice92a8ea,Icc81b5f6 into pi-dev am: 74bbe171bb am: 8e233cb5c6
...
am: 11569624aa
Change-Id: I2d1646f3c49f9eb64b8df86264508afdc7d6212b
2019-09-16 12:42:33 -07:00
Dan Albert
f2239112f1
Merge changes I71708114,Ice92a8ea,Icc81b5f6 into pi-dev am: 74bbe171bb am: 8e233cb5c6
...
am: 11569624aa
Change-Id: Ia24ff7316888c10dd36722d7f374558afd092bad
2019-09-16 12:42:33 -07:00
Dan Albert
6206713fe8
[automerger skipped] DO NOT MERGE: Fix bug in random. am: 01ed1e9c7b -s ours am: 4c056ce646
...
am: 7858a1bf96
Change-Id: I8a98e392b16e8adf845a79e08cb440ef09900d5e
2019-09-16 12:42:29 -07:00
Dan Albert
ad802fbf1f
[automerger skipped] DO NOT MERGE: Fix bug in random. am: 01ed1e9c7b -s ours am: 4c056ce646
...
am: 7858a1bf96
Change-Id: I2da4654f10d4ba598061c988ed4e3bb8a47e550f
2019-09-16 12:42:28 -07:00
Dan Albert
11569624aa
Merge changes I71708114,Ice92a8ea,Icc81b5f6 into pi-dev am: 74bbe171bb
...
am: 8e233cb5c6
Change-Id: I4b54697533c5c92f2a0bb3e8aada41746c4b637c
2019-09-16 12:34:32 -07:00
Dan Albert
7858a1bf96
[automerger skipped] DO NOT MERGE: Fix bug in random. am: 01ed1e9c7b -s ours
...
am: 4c056ce646
Change-Id: I01cdc10fa37bfa77d10e45f2b83a365f710b63c3
2019-09-16 12:34:27 -07:00
Dan Albert
8e233cb5c6
Merge changes I71708114,Ice92a8ea,Icc81b5f6 into pi-dev
...
am: 74bbe171bb
Change-Id: I596577098430bf27c7817aaa71ec10a13a44c609
2019-09-16 12:27:58 -07:00
Dan Albert
4c056ce646
[automerger skipped] DO NOT MERGE: Fix bug in random.
...
am: 01ed1e9c7b -s ours
am skip reason: subject contains skip directive
Change-Id: I4cb1a4848ba0f07eef10dde43161bad22152ffc1
2019-09-16 12:27:56 -07:00
TreeHugger Robot
74bbe171bb
Merge changes I71708114,Ice92a8ea,Icc81b5f6 into pi-dev
...
* changes:
DO NOT MERGE: Fix bug in random.
DO NOT MERGE: [libc++] Move __clamp_to_integral to <cmath>, and harden against min()/max() macros
DO NOT MERGE: [libc++] Add `__truncating_cast` for safely casting float types to integers
2019-09-16 19:16:10 +00:00
Dan Albert
7b9d256fcf
Merge "Merge changes I71708114,Ice92a8ea,I300b6565 into qt-dev am: 0540b9fc0b am: 93fa160993 am: fda98a6aa7" into qt-qpr1-dev-plus-aosp
...
am: 0c3e9a75ea
Change-Id: I2b870ddd336fe56645c10895950f93cda52829ee
2019-09-13 23:49:40 -07:00
Dan Albert
054b8706d8
Merge changes I71708114,Ice92a8ea,I300b6565 into qt-dev am: 0540b9fc0b am: 93fa160993 am: 014840f16c
...
am: 9f44a5f2b0
Change-Id: Ie5ea3df4c904dca4107380f45737f123424144f1
2019-09-13 23:49:24 -07:00
Android Build Merger (Role)
0c3e9a75ea
Merge "Merge changes I71708114,Ice92a8ea,I300b6565 into qt-dev am: 0540b9fc0b am: 93fa160993 am: fda98a6aa7" into qt-qpr1-dev-plus-aosp
2019-09-14 06:43:46 +00:00
Dan Albert
9f44a5f2b0
Merge changes I71708114,Ice92a8ea,I300b6565 into qt-dev am: 0540b9fc0b am: 93fa160993
...
am: 014840f16c
Change-Id: I1862b58537cb923370c09a4537e2c02455ffe350
2019-09-13 23:43:37 -07:00
Dan Albert
93b9a644ff
Merge changes I71708114,Ice92a8ea,I300b6565 into qt-dev am: 0540b9fc0b am: 93fa160993
...
am: fda98a6aa7
Change-Id: Ife30824f8c22cba7dc824075b21f059fd2602c72
2019-09-13 23:43:37 -07:00
Dan Albert
fda98a6aa7
Merge changes I71708114,Ice92a8ea,I300b6565 into qt-dev am: 0540b9fc0b
...
am: 93fa160993
Change-Id: I039ea994b15db94f26e1c0e106046751fa663477
2019-09-13 23:37:51 -07:00
Dan Albert
014840f16c
Merge changes I71708114,Ice92a8ea,I300b6565 into qt-dev am: 0540b9fc0b
...
am: 93fa160993
Change-Id: Id3f527a4b8d185b8b907dade75e4a9835ea904eb
2019-09-13 23:37:51 -07:00
Dan Albert
93fa160993
Merge changes I71708114,Ice92a8ea,I300b6565 into qt-dev
...
am: 0540b9fc0b
Change-Id: I874bfe8e7f05e4f0fa107108607fd864afdeec5d
2019-09-13 23:32:00 -07:00
TreeHugger Robot
0540b9fc0b
Merge changes I71708114,Ice92a8ea,I300b6565 into qt-dev
...
* changes:
Fix bug in random.
[libc++] Move __clamp_to_integral to <cmath>, and harden against min()/max() macros
[libc++] Add `__truncating_cast` for safely casting float types to integers
2019-09-14 06:12:53 +00:00
Louis Dionne
1d7a151d54
Merge changes from topic "am-8dc2ba4274a94ce59f511d40f1ff2d77" into qt-qpr1-dev-plus-aosp
...
am: f2b10b86b3
Change-Id: I57475f176ce99f34d59d94a40fd63550424d90ce
2019-09-13 21:13:28 -07:00
Louis Dionne
fb8d0572c0
[automerger skipped] DO NOT MERGE: [libc++] Move __clamp_to_integral to <cmath>, and harden against min()/max() macros am: 280d459517 -s ours am: 2a6b690b1d -s ours am: 00305f086b am: 6bda858567 am: 1f6fdc4fc8
...
am: 19ac1353b7 -s ours
am skip reason: subject contains skip directive
Change-Id: Ic5b0d9db8d85f1b4c7a01e46b80b97eb0ead2dcd
2019-09-13 21:13:26 -07:00
Louis Dionne
609cb418f1
[automerger skipped] DO NOT MERGE: [libc++] Move __clamp_to_integral to <cmath>, and harden against min()/max() macros am: 280d459517 -s ours am: 2a6b690b1d -s ours am: 00305f086b am: 6bda858567 am: 0c6e4f21e3
...
am: 16807dcb4e -s ours
am skip reason: subject contains skip directive
Change-Id: Icf2e0c9bee6f07548259d454461758e976a461d9
2019-09-13 21:13:00 -07:00
Louis Dionne
9ded96d65f
[automerger skipped] DO NOT MERGE: [libc++] Add __truncating_cast for safely casting float types to integers am: baeddde44d -s ours am: c05874bc7f -s ours am: 88e2778807 am: 43b3af6225 am: 8a1b744bfc
...
am: 8958f18553 -s ours
am skip reason: subject contains skip directive
Change-Id: Icee284cf26ff5bd0b529b040a320ffff5af8a05a
2019-09-13 21:12:57 -07:00
Android Build Merger (Role)
f2b10b86b3
Merge changes from topic "am-8dc2ba4274a94ce59f511d40f1ff2d77" into qt-qpr1-dev-plus-aosp
...
* changes:
[automerger skipped] DO NOT MERGE: [libc++] Move __clamp_to_integral to <cmath>, and harden against min()/max() macros am: 280d459517 -s ours am: 2a6b690b1d -s ours am: 00305f086b am: 6bda858567 am: 1f6fdc4fc8
[automerger skipped] DO NOT MERGE: [libc++] Add `__truncating_cast` for safely casting float types to integers am: baeddde44d -s ours am: c05874bc7f -s ours am: 88e2778807 am: 43b3af6225 am: d9dc534c74
2019-09-14 04:06:47 +00:00
Louis Dionne
19ac1353b7
[automerger skipped] DO NOT MERGE: [libc++] Move __clamp_to_integral to <cmath>, and harden against min()/max() macros am: 280d459517 -s ours am: 2a6b690b1d -s ours am: 00305f086b am: 6bda858567
...
am: 1f6fdc4fc8
Change-Id: I56ce2334817e511694a10c13e82d32c4d839a65d
2019-09-13 21:06:28 -07:00
Louis Dionne
16807dcb4e
[automerger skipped] DO NOT MERGE: [libc++] Move __clamp_to_integral to <cmath>, and harden against min()/max() macros am: 280d459517 -s ours am: 2a6b690b1d -s ours am: 00305f086b am: 6bda858567
...
am: 0c6e4f21e3
Change-Id: I6c2b89f661f3a8c52282ed893e5f36062ab0daeb
2019-09-13 21:06:28 -07:00
Louis Dionne
8958f18553
[automerger skipped] DO NOT MERGE: [libc++] Add __truncating_cast for safely casting float types to integers am: baeddde44d -s ours am: c05874bc7f -s ours am: 88e2778807 am: 43b3af6225
...
am: 8a1b744bfc
Change-Id: I6284b8b44e4dfe2ce883051a337010fb7cf41c7e
2019-09-13 21:06:23 -07:00
Louis Dionne
f83f796fe7
[automerger skipped] DO NOT MERGE: [libc++] Add __truncating_cast for safely casting float types to integers am: baeddde44d -s ours am: c05874bc7f -s ours am: 88e2778807 am: 43b3af6225
...
am: d9dc534c74
Change-Id: Ifdf8bccb8554bd761f4cd92c7d9d62f8c30a1506
2019-09-13 21:06:23 -07:00