summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-01-11[RESTRICT AUTOMERGE] Remove unnecessary test.Pete Bentley
Bug: 175528568 Test: TH Change-Id: Ia3ddc32e0c4091bd73a9862db0b1a2ccb7d4cf2d (cherry picked from commit d3b41c091cd4cb2f8c24603421d562aea7382068)
2021-01-11[RESTRICT AUTOMERGE] Remove unnecessary test.Pete Bentley
Bug: 175528568 Test: TH Change-Id: Ia3ddc32e0c4091bd73a9862db0b1a2ccb7d4cf2d (cherry picked from commit 8c5c1f8b4d82ae21e867fcacbaa1e2f0e74a4b01)
2020-12-09[automerger skipped] [DO NOT MERGE] Track behavior change in default ↵Tobias Thierer
HostnameVerifier. am: 50c55eb5ed -s ours am: 4837de4410 -s ours am: 9a2db9ef3d am: f39c2cf9bd -s ours am: 866a4e5f2a am: 57c3f4fdc9 Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/13135417 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4af90007be244ed0962581bd85d39cd3c71d548b
2020-12-09[automerger skipped] [DO NOT MERGE] Track behavior change in default ↵Tobias Thierer
HostnameVerifier. am: 50c55eb5ed -s ours am: 4837de4410 -s ours am: 9a2db9ef3d am: f39c2cf9bd -s ours am: 866a4e5f2a Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/13135417 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8f7aa4f34e0d0b9bb2f4a46b3d8ebf2ffc9bb82c
2020-12-09[automerger skipped] Merge "[DO NOT MERGE] Reject non-ASCII hostnames and ↵TreeHugger Robot
SANs." into qt-dev am: b7982a4035 am: 7f6961e6be -s ours am: 78a79b3a8e -s ours am: d813620682 -s ours am skip reason: Change-Id I7ccd2c6d4255d29112e9a6d58640316c364bf67a with SHA-1 650e71cc3a is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/13163676 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6ed5314a0afd74ffbf1beacee0d6714e07c92254
2020-12-09[automerger skipped] [DO NOT MERGE] Reject non-ASCII hostnames and SANs. am: ↵Pete Bentley
c247f14ad5 am: 2954a29740 -s ours am: 41f1e3cee3 -s ours am: ff72e23588 -s ours am skip reason: Change-Id I7ccd2c6d4255d29112e9a6d58640316c364bf67a with SHA-1 650e71cc3a is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/13163676 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic3d5dbf9173d12f55a02a6f9a5b58e33d410f220
2020-12-09[automerger skipped] [DO NOT MERGE] Track behavior change in default ↵Tobias Thierer
HostnameVerifier. am: 50c55eb5ed -s ours am: 4837de4410 -s ours am: 9a2db9ef3d am: f39c2cf9bd -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/13135417 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibd07e3f8aec711735d174be11642b79e1d46eee7
2020-12-09[automerger skipped] [DO NOT MERGE] Track behavior change in default ↵Tobias Thierer
HostnameVerifier. am: 50c55eb5ed -s ours am: 4837de4410 -s ours am: 9a2db9ef3d Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/13135417 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibd74d201ced7d5aa26534f277262488d902a6328
2020-12-09[automerger skipped] Merge "[DO NOT MERGE] Reject non-ASCII hostnames and ↵TreeHugger Robot
SANs." into qt-dev am: b7982a4035 am: 7f6961e6be -s ours am: 78a79b3a8e -s ours am skip reason: Change-Id I7ccd2c6d4255d29112e9a6d58640316c364bf67a with SHA-1 650e71cc3a is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/13163676 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1d2e16a9435732be7244bc4a6f52a48ff7c91e35
2020-12-09[automerger skipped] [DO NOT MERGE] Reject non-ASCII hostnames and SANs. am: ↵Pete Bentley
c247f14ad5 am: 2954a29740 -s ours am: 41f1e3cee3 -s ours am skip reason: Change-Id I7ccd2c6d4255d29112e9a6d58640316c364bf67a with SHA-1 650e71cc3a is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/13163676 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic6bc8a5d9e4e8ea1657abade6d3cb020403da5df
2020-12-09[automerger skipped] [DO NOT MERGE] Reject non-ASCII hostnames and SANs. am: ↵Pete Bentley
73bf5b6f1d -s ours am: 2611dfe767 am: 5a6a7fe4fe -s ours am: ced78c4c7a -s ours am: 4bbabb39ce -s ours am skip reason: Change-Id I7ccd2c6d4255d29112e9a6d58640316c364bf67a with SHA-1 650e71cc3a is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/13140220 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9c9c40a6b55e163bf1b538b69eec84a5bee9d099
2020-12-09[automerger skipped] Merge "[DO NOT MERGE] Reject non-ASCII hostnames and ↵TreeHugger Robot
SANs." into qt-dev am: b7982a4035 am: 7f6961e6be -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/13163676 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If8b2dbabe3bd9d3843450ae4827c8246d5b652d2
2020-12-09[automerger skipped] [DO NOT MERGE] Reject non-ASCII hostnames and SANs. am: ↵Pete Bentley
c247f14ad5 am: 2954a29740 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/13163676 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I339b9a41f714ed3806a4a1f527875f286ca181e4
2020-12-09[automerger skipped] [DO NOT MERGE] Track behavior change in default ↵Tobias Thierer
HostnameVerifier. am: 50c55eb5ed -s ours am: 4837de4410 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/13135417 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia6eab544008be7f25f4d562ec651e9cb6f5fcf07
2020-12-09[automerger skipped] [DO NOT MERGE] Reject non-ASCII hostnames and SANs. am: ↵Pete Bentley
73bf5b6f1d -s ours am: 2611dfe767 am: 5a6a7fe4fe -s ours am: ced78c4c7a -s ours am skip reason: Change-Id I7ccd2c6d4255d29112e9a6d58640316c364bf67a with SHA-1 650e71cc3a is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/13140220 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4a4d5f8b7debd9588a4ea7d018f2b1468c3c1b8d
2020-12-09Merge "[DO NOT MERGE] Reject non-ASCII hostnames and SANs." into qt-dev am: ↵TreeHugger Robot
b7982a4035 Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/13163676 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I54622ab202e4033fc45969e64d6dd8d234c20101
2020-12-09[DO NOT MERGE] Reject non-ASCII hostnames and SANs. am: c247f14ad5Pete Bentley
Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/13163676 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idaf0476b7dcb42975160ac2f05c875b7dc08bc8b
2020-12-09[automerger skipped] [DO NOT MERGE] Track behavior change in default ↵Tobias Thierer
HostnameVerifier. am: 50c55eb5ed -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/13135417 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I51bc18233cfbf23e5041e2a051da3608ec955d44
2020-12-09[automerger skipped] [DO NOT MERGE] Reject non-ASCII hostnames and SANs. am: ↵Pete Bentley
73bf5b6f1d -s ours am: 2611dfe767 am: 5a6a7fe4fe -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/13140220 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9e6dd81bd14fd75813aa719db63d3b23ad89d77e
2020-12-09Merge "[DO NOT MERGE] Reject non-ASCII hostnames and SANs." into qt-devTreeHugger Robot
2020-12-09[automerger skipped] [DO NOT MERGE] Reject non-ASCII hostnames and SANs. am: ↵Pete Bentley
73bf5b6f1d -s ours am: 2611dfe767 Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/13140220 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1077ec733d0d6cdc3273715057e0d35dcc311ed7
2020-12-09[automerger skipped] [DO NOT MERGE] Reject non-ASCII hostnames and SANs. am: ↵Pete Bentley
73bf5b6f1d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/13140220 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I305dacb57ac62a2a0cb297ff9280cc466558d3c8
2020-12-09[DO NOT MERGE] Reject non-ASCII hostnames and SANs.Pete Bentley
Updates test expectations to match OkHostnameVerifier behaviour changes in the same topic. Bug: 171980069 Test: atest CtsLibcoreTestCases CtsLibcoreOkHttpTestCases Change-Id: Ia5c6f7f95e827d43280292409b1a12c27756dba0 Merged-In: I7ccd2c6d4255d29112e9a6d58640316c364bf67a
2020-12-09[DO NOT MERGE] Reject non-ASCII hostnames and SANs.Pete Bentley
Updates test expectations to match OkHostnameVerifier behaviour changes in the same topic. Bug: 171980069 Test: atest CtsLibcoreTestCases CtsLibcoreOkHttpTestCases Change-Id: If66bf77754466daf8684ffae058180fd702dabc4 Merged-In: I7ccd2c6d4255d29112e9a6d58640316c364bf67a
2020-12-09Reject non-ASCII hostnames and SANs. am: 650e71cc3a am: cad6f31431Pete Bentley
Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/13163680 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I06720828da12fd1aea7cfaa802a0794e51bc24d5
2020-12-09Reject non-ASCII hostnames and SANs. am: 650e71cc3aPete Bentley
Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/13163680 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I29e2d32e3af23cace582fa80610f5ef188c28fd8
2020-12-04Reject non-ASCII hostnames and SANs.Pete Bentley
Updates test expectations to match OkHostnameVerifier behaviour changes in the same topic. Bug: 171980069 Test: atest CtsLibcoreTestCases CtsLibcoreOkHttpTestCases Change-Id: I7ccd2c6d4255d29112e9a6d58640316c364bf67a
2020-12-04[DO NOT MERGE] Track behavior change in default HostnameVerifier.Tobias Thierer
The default HostnameVerifier now ignores any CommonName in the certificate provided by the server, even when no subjectAltName is present. As well as the cherrypick for the CommonName behaviouer change, this also contains changes to match http://ag/13135278 which rejects non-ASCII names. Bug: 70278814 Bug: 171980069 Test: CtsLibcoreTestCases Change-Id: Ib6fa0c40d8903352e88d8812bf0c09ec1d8ef6be (cherry picked from commit 70bd0982aa6ed2603615df8a963f285b91872c87)
2020-09-01Handle missing parent interfacesDaulet Zhanguzin
While this does not fix having inconsistent interfaces, at least we don't fail enumerating them. With this change we still return these children interfaces without parent set. Bug: 159277702 Test: atest CtsLibcoreTestCases:libcore.java.net.NetworkInterfaceTest Change-Id: Ibbe1f273683eb169a0e96425a2c21c5072bf19d7 Merged-In: Ibbe1f273683eb169a0e96425a2c21c5072bf19d7
2020-08-21Fix reading large file offsets on 32-bitDaulet Zhanguzin
No 32 bit device on hand to verify, but this fix has been verified by partner. Test: Treehugger Bug: 156027158 (cherry pick from aosp) Change-Id: Ia604e7aac6cdd1cb46d5f2bcdf7f96cb56349954 Merged-In: Ia604e7aac6cdd1cb46d5f2bcdf7f96cb56349954
2020-08-20Remove RandomAccessFileTest#testSeekTooLarge. am: a6d35d95d6 am: 812a76de8d ↵Kazuhiro Inaba
am: 58b0088864 Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/12325563 Change-Id: I399749c288b5fa173d1987af08f1ec53b2a2c969
2020-08-20Remove RandomAccessFileTest#testSeekTooLarge. am: a6d35d95d6 am: 812a76de8dKazuhiro Inaba
Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/12325563 Change-Id: Ia483f46516fc18de51bdc059be02145a6c7aad2d
2020-08-20Remove RandomAccessFileTest#testSeekTooLarge. am: a6d35d95d6Kazuhiro Inaba
Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/12325563 Change-Id: Iee9ba61878ffed5525dd18b17160a7e020a833d1
2020-08-06Remove RandomAccessFileTest#testSeekTooLarge.Kazuhiro Inaba
The check is not valid across all platforms. The Long.MAX_VALUE offset can be accepted by some filesystems (like the default fuse lseek implementation) without errors. Bug: 161849068 Fixes: 161849068 Test: none Change-Id: I477a668d4457b6b0fa13ca007f4e732ed982b7bb
2020-07-31Merge "Use -target 8 for core-lambda-stubs" into rvc-dev am: 8a605f1988 am: ↵TreeHugger Robot
2d5abe8251 Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/12273667 Change-Id: I8866bf73d3caaa797695d5a1c9c101fcef76fcf2
2020-07-31Merge "Use -target 8 for core-lambda-stubs" into rvc-dev am: 8a605f1988TreeHugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/12273667 Change-Id: I2a858d98f37c72e3fdbd86faf0ed406b38c2996b
2020-07-31Merge "Use -target 8 for core-lambda-stubs" into rvc-devTreeHugger Robot
2020-07-30Use -target 8 for core-lambda-stubsColin Cross
core-lambda-stubs is distributed as part of the SDK and should use -target 8 for compatibility with old JDKs. Bug: 150153790 Bug: 162522383 Test: javap -v --system none -bootclasspath "" -cp out/target/common/obj/JAVA_LIBRARIES/core-lambda-stubs_intermediates/classes.jar java.lang.invoke.LambdaMetafactory | grep "major version" Change-Id: I73fcfefb353099fa6545b2ff1d2b2fcf677931ae Merged-In: I73fcfefb353099fa6545b2ff1d2b2fcf677931ae (cherry picked from commit dafdf70fc4c8cc8853aa04ece2f59db864550618)
2020-07-22Merge "Merge "Merge "[automerger skipped] Merge "Track tzdb 2020a changes [N ↵Automerger Merge Worker
MR1 CTS branch]" into nougat-mr1-cts-dev am: 9a5b1ba7f7 -s ours" into oreo-cts-dev am: 6d7a838f06 -s ours" into oreo-mr1-cts-dev am: 7c2d068af6 -s ours" into pie-cts-dev am: 525ebbc0d3 -s ours am: dd7692f2bc -s ours am: 9941add25f -s ours am: cb972ec9bd -s ours am: f38f916be3 -s ours am: 635ff2ebb9 -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1318271 Change-Id: I014497accc36dc9885ac26d12b411bc5c2c8baff
2020-07-22Merge "Merge "Merge "[automerger skipped] Merge "Merge "Track tzdb 2020a ↵Automerger Merge Worker
changes [N CTS branch]" into nougat-cts-dev am: 27dfa1af40" into nougat-mr1-cts-dev am: 2aeac88223 -s ours" into oreo-cts-dev am: 055b92daef -s ours" into oreo-mr1-cts-dev am: a9cdeb3196 -s ours" into pie-cts-dev am: b27a3fcb29 -s ours am: ec0435d2d0 -s ours am: 4271ac6877 -s ours am: 49b1f3df2c -s ours am: b36e48e744 -s ours am: d11f97fc8d -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1317311 Change-Id: I2e4057205c5696feec0f43770044f38e40226c87
2020-07-22Merge "Merge "Merge "[automerger skipped] Merge "Track tzdb 2020a changes [N ↵Automerger Merge Worker
MR1 CTS branch]" into nougat-mr1-cts-dev am: 9a5b1ba7f7 -s ours" into oreo-cts-dev am: 6d7a838f06 -s ours" into oreo-mr1-cts-dev am: 7c2d068af6 -s ours" into pie-cts-dev am: 525ebbc0d3 -s ours am: dd7692f2bc -s ours am: 9941add25f -s ours am: cb972ec9bd -s ours am: f38f916be3 -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1318271 Change-Id: I1451476a864eb517b78123f292df9a618a888d1c
2020-07-22Merge "Merge "Merge "[automerger skipped] Merge "Merge "Track tzdb 2020a ↵Automerger Merge Worker
changes [N CTS branch]" into nougat-cts-dev am: 27dfa1af40" into nougat-mr1-cts-dev am: 2aeac88223 -s ours" into oreo-cts-dev am: 055b92daef -s ours" into oreo-mr1-cts-dev am: a9cdeb3196 -s ours" into pie-cts-dev am: b27a3fcb29 -s ours am: ec0435d2d0 -s ours am: 4271ac6877 -s ours am: 49b1f3df2c -s ours am: b36e48e744 -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1317311 Change-Id: Ic41a1c98b064b12a547257f9852c6e008afbb28d
2020-07-22Merge "Merge "Merge "[automerger skipped] Merge "Track tzdb 2020a changes [N ↵Automerger Merge Worker
MR1 CTS branch]" into nougat-mr1-cts-dev am: 9a5b1ba7f7 -s ours" into oreo-cts-dev am: 6d7a838f06 -s ours" into oreo-mr1-cts-dev am: 7c2d068af6 -s ours" into pie-cts-dev am: 525ebbc0d3 -s ours am: dd7692f2bc -s ours am: 9941add25f -s ours am: cb972ec9bd -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1318271 Change-Id: I78159b3a57554e5914f2513dcc4231deab4b580e
2020-07-22Merge "Merge "Merge "[automerger skipped] Merge "Merge "Track tzdb 2020a ↵Automerger Merge Worker
changes [N CTS branch]" into nougat-cts-dev am: 27dfa1af40" into nougat-mr1-cts-dev am: 2aeac88223 -s ours" into oreo-cts-dev am: 055b92daef -s ours" into oreo-mr1-cts-dev am: a9cdeb3196 -s ours" into pie-cts-dev am: b27a3fcb29 -s ours am: ec0435d2d0 -s ours am: 4271ac6877 -s ours am: 49b1f3df2c -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1317311 Change-Id: Ibe0a577666eccc2cde1475ecba7367dd7d03b7e7
2020-07-22Merge "Merge "Merge "[automerger skipped] Merge "Track tzdb 2020a changes [N ↵Automerger Merge Worker
MR1 CTS branch]" into nougat-mr1-cts-dev am: 9a5b1ba7f7 -s ours" into oreo-cts-dev am: 6d7a838f06 -s ours" into oreo-mr1-cts-dev am: 7c2d068af6 -s ours" into pie-cts-dev am: 525ebbc0d3 -s ours am: dd7692f2bc -s ours am: 9941add25f -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1318271 Change-Id: I7f0497c2b44786ef6eb4b87476048dc30c2c1bc5
2020-07-22Merge "Merge "Merge "[automerger skipped] Merge "Merge "Track tzdb 2020a ↵Automerger Merge Worker
changes [N CTS branch]" into nougat-cts-dev am: 27dfa1af40" into nougat-mr1-cts-dev am: 2aeac88223 -s ours" into oreo-cts-dev am: 055b92daef -s ours" into oreo-mr1-cts-dev am: a9cdeb3196 -s ours" into pie-cts-dev am: b27a3fcb29 -s ours am: ec0435d2d0 -s ours am: 4271ac6877 -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1317311 Change-Id: Ia30b5ca803c0f90226e2ecd1680bcd6f825d9390
2020-07-22Merge "Merge "Merge "[automerger skipped] Merge "Track tzdb 2020a changes [N ↵Automerger Merge Worker
MR1 CTS branch]" into nougat-mr1-cts-dev am: 9a5b1ba7f7 -s ours" into oreo-cts-dev am: 6d7a838f06 -s ours" into oreo-mr1-cts-dev am: 7c2d068af6 -s ours" into pie-cts-dev am: 525ebbc0d3 -s ours am: dd7692f2bc -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 7275c92b32 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1318271 Change-Id: I50fd02721f2eb072defca6960bb6cafa09f76f13
2020-07-22Merge "Merge "Merge "[automerger skipped] Merge "Merge "Track tzdb 2020a ↵Automerger Merge Worker
changes [N CTS branch]" into nougat-cts-dev am: 27dfa1af40" into nougat-mr1-cts-dev am: 2aeac88223 -s ours" into oreo-cts-dev am: 055b92daef -s ours" into oreo-mr1-cts-dev am: a9cdeb3196 -s ours" into pie-cts-dev am: b27a3fcb29 -s ours am: ec0435d2d0 -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 7275c92b32 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1317311 Change-Id: I57b6b9ada7435e51ddd369508c643e77d4234d40
2020-07-20Merge "[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-15cb99cc4d4c429085be893ac571ecd0" into oreo-mr1-cts-dev am: 9ba7ea0b4c -s ours" into pie-cts-dev am: 5b3d134769 -s ours am: 80489e72ce -s ours am: 29b5232a46 -s ours am: 42d92fc09a -s ours am: 53515c0fec -s ours am: f669d1913c -s ours am skip reason: Change-Id If6a2dbb615a70739350cbae91cc33754afe2b793 with SHA-1 044bd5e685 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1311474 Change-Id: Ia48f468c3a91e7e7f6b6504221e0942f3e72b9f5
2020-07-20Merge "[automerger skipped] Merge "Track tzdb 2020a changes [N MR1 CTS ↵Automerger Merge Worker
branch]" into nougat-mr1-cts-dev am: 9a5b1ba7f7 -s ours" into oreo-cts-dev am: 6d7a838f06 -s ours am: 0181865f43 -s ours am: 887558033e -s ours am: b2a10d03b9 -s ours am: c06d07791e -s ours am: ed303c8a3f -s ours am: 5c6e1a6cfe -s ours am: bc5b273232 -s ours am: 5b82429876 -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1318271 Change-Id: I22ec3d20970afb5ec1a801336469a23e5f363e97
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-03 04:51:22 +0000