summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Set apex_available propertyandroid-r-preview-4android-r-preview-3android-r-preview-2Jiyong Park2020-03-071-0/+8
| | | | | | | | | | The marked library(ies) were available to the APEXes via the hand-written whitelist in build/soong/apex/apex.go. Trying to remove the whitelist by adding apex_available property to the Android.bp of the libraries. Bug: 150999716 Test: m Change-Id: I60e1ae6fa837772c2682d4a26ea34bd80e69bc9e
* Make ramdisk_available.Yifan Hong2020-01-241-0/+2
|\ | | | | | | | | | | am: 5488d3c961 Change-Id: If211e950f077fb039aad833fe1d4e55c4446ff1f
| * Make ramdisk_available.android-r-preview-1Yifan Hong2020-01-221-0/+2
| | | | | | | | | | | | Test: pass Bug: 147347110 Change-Id: If00a2f7c12100c76c25da4501ae40fa02e44634d
* | Change libc++ to stop statically linking the unwinder.Peter Collingbourne2020-01-211-4/+0
|\| | | | | | | | | | | am: fa2de1c6b1 Change-Id: If2b374cc0b4d5f39556c3c38019c702fc5cbf565
| * Change libc++ to stop statically linking the unwinder.Peter Collingbourne2020-01-101-4/+0
| | | | | | | | | | Bug: 144430859 Change-Id: I012d03c244be7a8222c2b95b0f8cd9a971b87a85
* | Merge Android10 QPR1 into AOSP master am: fb268a4f43Xin Li2019-12-040-0/+0
|\ \ | | | | | | | | | | | | | | | am: eca87302c9 Change-Id: I6cc99d69bfaae98da4314ecc9da6dfb7f3877aa9
| * | Merge Android10 QPR1 into AOSP masterXin Li2019-12-030-0/+0
| |\| | | | | | | | | | | | | | | | am: fb268a4f43 Change-Id: Ib76ee7a8b8615285f97f1a22b33544ea603a0e84
| | * Merge Android10 QPR1 into AOSP masterXin Li2019-12-026-21/+248
| | |\ | | |/ | |/| | | | | | | Bug: 145570283 Change-Id: I879eb9219649abdbe2d2686adc692e835eab7997
* | | DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li2019-10-310-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: d83b1340c0 Change-Id: Iac60552ce22f3ebe307724c2fa5ec2cfb063fd5a
| * | DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li2019-10-306-21/+248
| |\ \ | | |/ | |/| | | | | | | | | | | | | stage-aosp-master Bug: 142003500 Change-Id: I213c6b19f360523358086c57a3e56ef3af9ef17d
* | | Remove -nodefaultlibs and -nostdinc++ am: 50f73d79e4 am: 14a8db71ebColin Cross2019-10-031-5/+0
|\ \ \ | |_|/ |/| | | | | | | | | | | am: e5dd445a66 Change-Id: I72dc68848f9e12ccf24b6af9dffd625db65edb39
| * | Remove -nodefaultlibs and -nostdinc++ am: 50f73d79e4Colin Cross2019-10-031-5/+0
| |\| | | | | | | | | | | | | | | | am: 14a8db71eb Change-Id: Iba48efd597f6a2c83a02ad11a283263c33f05322
| | * Remove -nodefaultlibs and -nostdinc++Colin Cross2019-10-031-5/+0
| | |\ | | | | | | | | | | | | | | | | | | | | am: 50f73d79e4 Change-Id: I08bfcc25d549d2cbb7e7f59b500f53bf63f00756
| | | * Remove -nodefaultlibs and -nostdinc++Colin Cross2019-10-031-5/+0
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -nostdinc++ is already passed by the build system for stl: "none". -nodefaultlibs was prevoiusly passed by the build system, but has been replaced with -nostdlib++ to avoid having to manually pass all the other default libraries on the command line. Passing -nodefaultlibs here causes libc++ to no longer link against libc. Test: m checkbuild Change-Id: Ib3392d545f68be594800fe806ecd365f830d201e
* | | [automerger skipped] DO NOT MERGE: Fix bug in random. am: 4151c1e35a am: ↵Dan Albert2019-09-170-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8449105f92 am: acd0f55f5a -s ours am: 6a7b102d0d -s ours am: 26b83d7bb1 am: 2627678ada am: ade0433e9a Change-Id: I125098c30e67d1fe7df111fdf690faf0198ec2f5
| * \ \ [automerger skipped] DO NOT MERGE: Fix bug in random. am: 4151c1e35a am: ↵android-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30Dan Albert2019-09-170-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8449105f92 am: acd0f55f5a -s ours am: 6a7b102d0d -s ours am: 26b83d7bb1 am: 2627678ada Change-Id: Icae4b962a39be27bbf20e9367471d167df14e207
* | | | | [automerger skipped] DO NOT MERGE: [libc++] Move __clamp_to_integral to ↵Louis Dionne2019-09-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <cmath>, and harden against min()/max() macros am: 7af7a63c2e am: d190f65c64 am: f0f107c222 -s ours am: b3d336063c -s ours am: c940a9b998 am: 30b59adf32 am: 9fe6d7544e Change-Id: I6641668cdd422cecb93dcacf169fdac80ce14ed2
| * | | | [automerger skipped] DO NOT MERGE: [libc++] Move __clamp_to_integral to ↵Louis Dionne2019-09-170-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <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
* | | | | | [automerger skipped] DO NOT MERGE: [libc++] Add `__truncating_cast` for ↵Louis Dionne2019-09-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | safely casting float types to integers am: 55b6136b3a am: 9546d85a3d am: c3a80bd37a -s ours am: f126b4ea11 -s ours am: 9432e1044b am: f4f52f6f73 am: 367fe25436 Change-Id: I63770bffb468748510e0b20c13ed1f5cc84fe093
| * | | | | [automerger skipped] DO NOT MERGE: [libc++] Add `__truncating_cast` for ↵Louis Dionne2019-09-170-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | safely casting float types to integers am: 55b6136b3a am: 9546d85a3d am: c3a80bd37a -s ours am: f126b4ea11 -s ours am: 9432e1044b am: f4f52f6f73 Change-Id: Ia2dcbf166f24f34bb727abe7dc11cc5ab3b1f0db
* | \ \ \ \ \ [automerger skipped] DO NOT MERGE: Fix bug in random. am: 4151c1e35a am: ↵Dan Albert2019-09-170-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8449105f92 am: acd0f55f5a -s ours am: 6a7b102d0d -s ours am: 26b83d7bb1 am: 2627678ada am: f97d1ad2ef Change-Id: I8b7c2ca5b65bb0f84dccf156d5dd42c16ca6dab4
| * | | | | | [automerger skipped] DO NOT MERGE: Fix bug in random. am: 4151c1e35a am: ↵Dan Albert2019-09-170-0/+0
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8449105f92 am: acd0f55f5a -s ours am: 6a7b102d0d -s ours am: 26b83d7bb1 am: 2627678ada Change-Id: I726af707a34901fc8ca429ebfde271cee3736601
| | * | | | | [automerger skipped] DO NOT MERGE: Fix bug in random. am: 4151c1e35a am: ↵Dan Albert2019-09-170-0/+0
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8449105f92 am: acd0f55f5a -s ours am: 6a7b102d0d -s ours am: 26b83d7bb1 Change-Id: I82b55f5e129679fac16720c7c6e41fed43030422
| | | * | | | [automerger skipped] DO NOT MERGE: Fix bug in random. am: 4151c1e35a am: ↵Dan Albert2019-09-170-0/+0
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8449105f92 am: acd0f55f5a -s ours am: 6a7b102d0d -s ours am skip reason: subject contains skip directive Change-Id: I6f1ff483a1840c10f316143a0fd3444a03140e77
| | | | * \ \ \ [automerger skipped] DO NOT MERGE: Fix bug in random. am: 4151c1e35a am: ↵Dan Albert2019-09-170-0/+0
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8449105f92 am: acd0f55f5a -s ours am skip reason: subject contains skip directive Change-Id: I4e96ce8bad3035bd478d1b7aca51f686736ae5c8
| | | | | * \ \ \ DO NOT MERGE: Fix bug in random. am: 4151c1e35aDan Albert2019-09-170-0/+0
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8449105f92 Change-Id: Ib7b8eafc1b77a835073736229dfa67f3123bf531
| | | | | | * \ \ \ DO NOT MERGE: Fix bug in random.Dan Albert2019-09-173-21/+103
| | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4151c1e35a Change-Id: I49f7617ddb21955b7f7c8ea2fba95f46eb7b2fc8
| | | | | | | * | | | DO NOT MERGE: Fix bug in random.Dan Albert2019-09-133-21/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: ./run_test.py --bitness 32 Test: ./run_test.py --bitness 64 Test: ./run_test.py --bitness 64 --host Bug: https://bugs.chromium.org/p/chromium/issues/detail?id=994957 Bug: http://b/139690488 Change-Id: I71708114d7fc8ed90c30b4d32b01d3f3aef7600b (cherry picked from commit a1d1caa3d831030ce802ed335a9743180911d553) (cherry picked from commit b8d9dff1befd40627b8c2c6e021cd5a3e4fe8b52)
* | | | | | | | | | | [automerger skipped] DO NOT MERGE: [libc++] Move __clamp_to_integral to ↵Louis Dionne2019-09-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <cmath>, and harden against min()/max() macros am: 7af7a63c2e am: d190f65c64 am: f0f107c222 -s ours am: b3d336063c -s ours am: c940a9b998 am: 30b59adf32 am: 76baa17f5c Change-Id: Ibdf13d5ad6f06e2b9611b670583c5e2fe6556c74
| * | | | | | | | | | [automerger skipped] DO NOT MERGE: [libc++] Move __clamp_to_integral to ↵Louis Dionne2019-09-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <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: I424763f551f167b025896b2f74940b336f6a97be
| | * | | | | | | | | [automerger skipped] DO NOT MERGE: [libc++] Move __clamp_to_integral to ↵Louis Dionne2019-09-170-0/+0
| | |\| | | | | | | | | | | |_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <cmath>, and harden against min()/max() macros am: 7af7a63c2e am: d190f65c64 am: f0f107c222 -s ours am: b3d336063c -s ours am: c940a9b998 Change-Id: Ibc6ef8eb7d2345f361ab2aad8aec5fd962e1861c
| | | * | | | | | | [automerger skipped] DO NOT MERGE: [libc++] Move __clamp_to_integral to ↵Louis Dionne2019-09-170-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <cmath>, and harden against min()/max() macros am: 7af7a63c2e am: d190f65c64 am: f0f107c222 -s ours am: b3d336063c -s ours am skip reason: subject contains skip directive Change-Id: I0e7df6c385fc603eeac5febb4d703b0fecb22c99
| | | | * | | | | | [automerger skipped] DO NOT MERGE: [libc++] Move __clamp_to_integral to ↵Louis Dionne2019-09-170-0/+0
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <cmath>, and harden against min()/max() macros am: 7af7a63c2e am: d190f65c64 am: f0f107c222 -s ours am skip reason: subject contains skip directive Change-Id: I1123bb1c4d74301f0df1f55fc06f9eae614358bc
| | | | | * | | | | DO NOT MERGE: [libc++] Move __clamp_to_integral to <cmath>, and harden ↵Louis Dionne2019-09-171-34/+0
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | against min()/max() macros am: 7af7a63c2e am: d190f65c64 Change-Id: If4680e91b42c8d183de0b7e15a9b682f3efa7fb5
| | | | | | * | | | DO NOT MERGE: [libc++] Move __clamp_to_integral to <cmath>, and harden ↵Louis Dionne2019-09-173-34/+51
| | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | against min()/max() macros am: 7af7a63c2e Change-Id: I2e4e0cdbbfa903ab8785f6d71f1afd0468cd1394
| | | | | | | * | | DO NOT MERGE: [libc++] Move __clamp_to_integral to <cmath>, and harden ↵Louis Dionne2019-09-133-34/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | against min()/max() macros git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@370900 91177308-0d34-0410-b5e6-96231b3b80d8 (cherry picked from commit 87e6185621d332d2ef8695b94778663380c83bb9) Bug: https://bugs.chromium.org/p/chromium/issues/detail?id=994957 Bug: http://b/139690488 Change-Id: Ice92a8ea6f675be069a70c5ad1003cf99b4fc474 (cherry picked from commit 82e0483c4a47233ed2f7bab545b32e5ddd474e59) (cherry picked from commit 21beede0ddfffab3e31961a68f7282b54f3ab52a)
* | | | | | | | | | [automerger skipped] DO NOT MERGE: [libc++] Add `__truncating_cast` for ↵Louis Dionne2019-09-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | safely casting float types to integers am: 55b6136b3a am: 9546d85a3d am: c3a80bd37a -s ours am: f126b4ea11 -s ours am: 9432e1044b am: f4f52f6f73 am: 6765ed382c Change-Id: I5526cf852cfba7541c8943f0556cdd4b80700c49
| * | | | | | | | | [automerger skipped] DO NOT MERGE: [libc++] Add `__truncating_cast` for ↵Louis Dionne2019-09-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | safely casting float types to integers am: 55b6136b3a am: 9546d85a3d am: c3a80bd37a -s ours am: f126b4ea11 -s ours am: 9432e1044b am: f4f52f6f73 Change-Id: I263264fd896fa74aed2b21b746b40ea2517419d1
| | * | | | | | | | [automerger skipped] DO NOT MERGE: [libc++] Add `__truncating_cast` for ↵Louis Dionne2019-09-170-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | safely casting float types to integers am: 55b6136b3a am: 9546d85a3d am: c3a80bd37a -s ours am: f126b4ea11 -s ours am: 9432e1044b Change-Id: I119d98960f63fafb4f15c141b29dbc92d13cfd5b
| | | * | | | | | | [automerger skipped] DO NOT MERGE: [libc++] Add `__truncating_cast` for ↵Louis Dionne2019-09-170-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | safely casting float types to integers am: 55b6136b3a am: 9546d85a3d am: c3a80bd37a -s ours am: f126b4ea11 -s ours am skip reason: subject contains skip directive Change-Id: Ie7823dcce173a2171e36f818d97b76aa29a39629
| | | | * | | | | | [automerger skipped] DO NOT MERGE: [libc++] Add `__truncating_cast` for ↵Louis Dionne2019-09-170-0/+0
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | safely casting float types to integers am: 55b6136b3a am: 9546d85a3d am: c3a80bd37a -s ours am skip reason: subject contains skip directive Change-Id: I7f4c24495e654dc6aff6d452118438c35af5226b
| | | | | * | | | | DO NOT MERGE: [libc++] Add `__truncating_cast` for safely casting float ↵Louis Dionne2019-09-171-0/+34
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | types to integers am: 55b6136b3a am: 9546d85a3d Change-Id: I48b42cca42e5a4eeb763de585b72cb0dfb854cd7
| | | | | | * | | | DO NOT MERGE: [libc++] Add `__truncating_cast` for safely casting float ↵Louis Dionne2019-09-172-0/+124
| | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | types to integers am: 55b6136b3a Change-Id: I621f34d4fdde4ddcf2ca2083e0ab524428e2e188
| | | | | | | * | | DO NOT MERGE: [libc++] Add `__truncating_cast` for safely casting float ↵Louis Dionne2019-09-132-0/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | types to integers This is needed anytime we need to clamp an arbitrary floating point value to an integer type. Thanks to Eric Fiselier for the patch. Differential Revision: https://reviews.llvm.org/D66836 git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@370891 91177308-0d34-0410-b5e6-96231b3b80d8 (cherry picked from commit c9ac8d533010d8915bcfdecab891fb451f71ce74) (cherry picked from commit 4561f55204960c0b3bc4594089ddcf56e5655cad) (cherry picked from commit f4471784fdb5799b9862febc385a26becfbe53b3) Bug: https://bugs.chromium.org/p/chromium/issues/detail?id=994957 Bug: http://b/139690488 Change-Id: I3d402ed0237a2f5f934a5d368ca91304bfcd9ed0
* | | | | | | | | | [automerger skipped] DO NOT MERGE: Fix bug in random. am: 188246de28 -s ours ↵Dan Albert2019-09-160-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f7c9cee159 -s ours am: 5d8e33dc3b am: abb6e0eaea am: f88480735b Change-Id: Ie689be53f3b7d96af2abb82be073f5debf59bab5
| * | | | | | | | | [automerger skipped] DO NOT MERGE: Fix bug in random. am: 188246de28 -s ours ↵Dan Albert2019-09-160-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f7c9cee159 -s ours am: 5d8e33dc3b am: abb6e0eaea Change-Id: I58ae41b7f088068cebd863aab5b3868bb7b302fe
* | | | | | | | | | [automerger skipped] DO NOT MERGE: Fix bug in random. am: 188246de28 -s ours ↵Dan Albert2019-09-160-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f7c9cee159 -s ours am: 5d8e33dc3b am: abb6e0eaea am: d4c0159f1a Change-Id: Ib635525612c6f3397e8a446121a21fa9ccb0afa9
| * | | | | | | | | [automerger skipped] DO NOT MERGE: Fix bug in random. am: 188246de28 -s ours ↵Dan Albert2019-09-160-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f7c9cee159 -s ours am: 5d8e33dc3b am: abb6e0eaea Change-Id: I036cf1841296a8d3541f85ddf6b6af791e9c04cb
| | * | | | | | | | [automerger skipped] DO NOT MERGE: Fix bug in random. am: 188246de28 -s ours ↵Dan Albert2019-09-160-0/+0
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f7c9cee159 -s ours am: 5d8e33dc3b Change-Id: Icf03abb8c5e14be613898fbcc337fbebf87de18f
| | | * | | | | | | [automerger skipped] DO NOT MERGE: Fix bug in random. am: 188246de28 -s oursDan Albert2019-09-160-0/+0
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f7c9cee159 -s ours am skip reason: subject contains skip directive Change-Id: I1f741eee132b134939cee8a66f5558d9be4af7f8