aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-11-18Snap for 9305793 from c11b1655934068670e8e41050a04532185eedd57 to ↵android-13.0.0_r49android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseAndroid Build Coastguard Worker
tm-qpr2-release Change-Id: I13a0470c24cdfce531663d13f177a6ad4e1314ba
2022-11-17[PATCH] Enable new_robolectric am: 04d65d2ba6 am: 452440957eandroid-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseRex Hoffman
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/20464386 Change-Id: Ib7ac71028744d88b5789bca6a3de5b943c26bb22 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-17[PATCH] Enable new_robolectric am: 04d65d2ba6Rex Hoffman
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/20464386 Change-Id: Id4aea6991cfb587701ba8bb1cf2f8b5e975292f3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-13[PATCH] Enable new_robolectricRex Hoffman
Test: mma in /external/robolectric Bug: 244627502 Change-Id: Iea16ea478624c054540ddaeb177adf12ccb0abc3 Merged-In: Iea16ea478624c054540ddaeb177adf12ccb0abc3
2022-04-22[automerger skipped] [DO NOT MERGE] Update external/okhttp/repackaged to ↵Pete Bentley
match source. am: d101e9eff4 am: 35d92595a5 -s ours am: 459e6fd7d9 -s ours am: daf7b23787 -s ours am: 3ba50826f4 -s ours am: df7b69f0ca -s ours am: f7ed88329e -s ours am: e6f20599f9 -s ours am: bcc0208de9 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/17823868 Change-Id: Iadd2e788321c472a471dabd3dee69baa2a644440 Ignore-AOSP-First: this is an automerge Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22[automerger skipped] [DO NOT MERGE] Update external/okhttp/repackaged to ↵Pete Bentley
match source. am: d101e9eff4 am: 35d92595a5 -s ours am: 459e6fd7d9 -s ours am: daf7b23787 -s ours am: 3ba50826f4 -s ours am: 24a643da8e -s ours am: 76fc8f4998 -s ours am: 626bf86013 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/17823868 Change-Id: I93b151f5b80983c784e5ec39e03bb0f1ae43eb47 Ignore-AOSP-First: this is an automerge Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22[automerger skipped] [DO NOT MERGE] Update external/okhttp/repackaged to ↵Pete Bentley
match source. am: d101e9eff4 am: 35d92595a5 -s ours am: 459e6fd7d9 -s ours am: daf7b23787 -s ours am: 3ba50826f4 -s ours am: df7b69f0ca -s ours am: f7ed88329e -s ours am: e6f20599f9 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/17823868 Change-Id: Id8a96b914c8de99c5235196aaa243fde31918179 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22[automerger skipped] [DO NOT MERGE] Update external/okhttp/repackaged to ↵Pete Bentley
match source. am: d101e9eff4 am: 35d92595a5 -s ours am: 459e6fd7d9 -s ours am: daf7b23787 -s ours am: 3ba50826f4 -s ours am: 24a643da8e -s ours am: 76fc8f4998 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/17823868 Change-Id: Ic6096cb9a0faa756156349e0edd0564fc25fca4a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22[automerger skipped] [DO NOT MERGE] Update external/okhttp/repackaged to ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-vts-13.0_r4android-vts-13.0_r3android-vts-13.0_r2android-cts-13.0_r4android-cts-13.0_r3android-cts-13.0_r2android13-frc-odp-releaseandroid13-devPete Bentley
match source. am: d101e9eff4 am: 35d92595a5 -s ours am: 459e6fd7d9 -s ours am: daf7b23787 -s ours am: 3ba50826f4 -s ours am: df7b69f0ca -s ours am: f7ed88329e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/17823868 Change-Id: Ia991f18204d446c63e50a71d53fedf4e66b983d7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22[automerger skipped] [DO NOT MERGE] Update external/okhttp/repackaged to ↵Pete Bentley
match source. am: d101e9eff4 am: 35d92595a5 -s ours am: 459e6fd7d9 -s ours am: daf7b23787 -s ours am: 3ba50826f4 -s ours am: df7b69f0ca -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/17823868 Change-Id: I07109f3176ff7db66caa6a696fa9568377b9ab70 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22[automerger skipped] [DO NOT MERGE] Update external/okhttp/repackaged to ↵Pete Bentley
match source. am: d101e9eff4 am: 35d92595a5 -s ours am: 459e6fd7d9 -s ours am: daf7b23787 -s ours am: 3ba50826f4 -s ours am: 24a643da8e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/17823868 Change-Id: I437d923d66a06292de56234ec118824f504dd707 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22[automerger skipped] [DO NOT MERGE] Update external/okhttp/repackaged to ↵Pete Bentley
match source. am: d101e9eff4 am: 35d92595a5 -s ours am: 459e6fd7d9 -s ours am: daf7b23787 -s ours am: 3ba50826f4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/17823868 Change-Id: Iae9b11abd745889acef5a73eab7117c02b63904f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22[automerger skipped] [DO NOT MERGE] Update external/okhttp/repackaged to ↵Pete Bentley
match source. am: d101e9eff4 am: 35d92595a5 -s ours am: 459e6fd7d9 -s ours am: daf7b23787 -s ours am: 3ba50826f4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/17823868 Change-Id: I504efbe6f64609596a3b1c4a13095c89e226c52a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22[automerger skipped] [DO NOT MERGE] Update external/okhttp/repackaged to ↵Pete Bentley
match source. am: d101e9eff4 am: 35d92595a5 -s ours am: 459e6fd7d9 -s ours am: daf7b23787 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/17823868 Change-Id: I6a510885194b350863e829b4e1a112311a934c12 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22[automerger skipped] [DO NOT MERGE] Update external/okhttp/repackaged to ↵Pete Bentley
match source. am: d101e9eff4 am: 35d92595a5 -s ours am: 459e6fd7d9 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/17823868 Change-Id: I31f0fff137dd7aabe0efbb84450c37fc6de73b4e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22[automerger skipped] [DO NOT MERGE] Update external/okhttp/repackaged to ↵Pete Bentley
match source. am: d101e9eff4 am: 35d92595a5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/17823868 Change-Id: I684a2d45fc381abe25131dc5f175abe788f57acd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22[DO NOT MERGE] Update external/okhttp/repackaged to match source. am: d101e9eff4Pete Bentley
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/17823868 Change-Id: Ica0ed13be3743ca71c48f82792da59fd89e1b935 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22[DO NOT MERGE] Update external/okhttp/repackaged to match source.Pete Bentley
The fix for CVE-2021-0341 in qt-dev was cherry-picked from pi-dev. However while the repackaged okhttp files did not required merging for pi-dev, they *do* for qt-dev and beyond. This change merges them in qt-dev, and qt-qpr2-dev after automerging. Is set to do not merge as the fix was applied correctly to rvc-dev and all branches downstream of that. Bug: 171980069 Test: atest CtsLibcoreTestCases CtsLibcoreOkHttpTestCases Change-Id: Ic47bb42d68c768277be0a8677cd9830ee03ff293
2022-04-13Merge "Merge "Merge "Merge "UPSTREAM: Increase test timeout for slow ↵Automerger Merge Worker
devices" into android11-tests-dev am: fbc842a7a8" into android12-tests-dev am: e55ad96827" into android12L-tests-dev am: b308b06472" am: 6549691b14 am: 102a74baba am: b6821f6df2 am: 8b36497875 am: c39c7c624e Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2059350 Change-Id: Ic34d1f1576057cdcfdceea8fdff28545276b6bd3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Merge "Merge "Merge "Merge "UPSTREAM: Increase test timeout for slow ↵Automerger Merge Worker
devices" into android11-tests-dev am: fbc842a7a8" into android12-tests-dev am: e55ad96827" into android12L-tests-dev am: b308b06472" am: 6549691b14 am: 102a74baba am: b6821f6df2 am: 8b36497875 Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2059350 Change-Id: I7b8fbbe33eb902a46df5c2d77e4ae61cf7194784 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Merge "Merge "Merge "Merge "UPSTREAM: Increase test timeout for slow ↵Automerger Merge Worker
devices" into android11-tests-dev am: fbc842a7a8" into android12-tests-dev am: e55ad96827" into android12L-tests-dev am: b308b06472" am: 6549691b14 am: 102a74baba am: b6821f6df2 Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2059350 Change-Id: I790f56c7590314d0f75c2abdd1240dcf81411d7d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Merge "Merge "Merge "Merge "UPSTREAM: Increase test timeout for slow ↵Automerger Merge Worker
devices" into android11-tests-dev am: fbc842a7a8" into android12-tests-dev am: e55ad96827" into android12L-tests-dev am: b308b06472" am: 6549691b14 am: 102a74baba Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2059350 Change-Id: Ie62ee893e877e37103ac9605758f3f3f66c4b15f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Merge "Merge "Merge "Merge "UPSTREAM: Increase test timeout for slow ↵Automerger Merge Worker
devices" into android11-tests-dev am: fbc842a7a8" into android12-tests-dev am: e55ad96827" into android12L-tests-dev am: b308b06472" am: 6549691b14 Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2059350 Change-Id: I44e05c4728f0c9b9fd50a7d401677a1a3df97ac8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Merge "Merge "Merge "Merge "UPSTREAM: Increase test timeout for slow ↵Automerger Merge Worker
devices" into android11-tests-dev am: fbc842a7a8" into android12-tests-dev am: e55ad96827" into android12L-tests-dev am: b308b06472"
2022-04-13Merge "Merge "Merge "UPSTREAM: Increase test timeout for slow devices" into ↵Automerger Merge Worker
android11-tests-dev am: fbc842a7a8" into android12-tests-dev am: e55ad96827" into android12L-tests-dev am: b308b06472 Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2059350 Change-Id: I289716aa1d1d3015089379c2122ee4a12d3f6d58 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Merge "Merge "Merge "UPSTREAM: Increase test timeout for slow devices" into ↵Automerger Merge Worker
android11-tests-dev am: fbc842a7a8" into android12-tests-dev am: e55ad96827" into android12L-tests-dev
2022-04-13Merge "Merge "UPSTREAM: Increase test timeout for slow devices" into ↵Automerger Merge Worker
android11-tests-dev am: fbc842a7a8" into android12-tests-dev am: e55ad96827 Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2059350 Change-Id: I64c502f56d4f015b3db0837b1a762698bf52fe2d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Merge "Merge "UPSTREAM: Increase test timeout for slow devices" into ↵Automerger Merge Worker
android11-tests-dev am: fbc842a7a8" into android12-tests-dev
2022-04-13Merge "UPSTREAM: Increase test timeout for slow devices" into ↵Shao-Chuan Lee
android11-tests-dev am: fbc842a7a8 Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2059350 Change-Id: I53d2f913dbe04ec18213a58c1e6fcccf551de6d5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Merge "UPSTREAM: Increase test timeout for slow devices" into ↵Shao-Chuan Lee
android11-tests-dev
2022-04-12UPSTREAM: Increase test timeout for slow devicesShao-Chuan Lee
This is a backport of upstream commit https://github.com/square/okhttp/commit/45e44a390cd287a141dc0f446038169608294879 > OEMs have found some configurations of Android devices that cannot > meet the timeout. This change doubles the timeout from 30 to 60 > seconds. > > The Android bug reference is 27273056. Bug: 210828057 Test: atest 'CtsLibcoreOkHttpTestCases:com.squareup.okhttp.internal.DiskLruCacheTest#rebuildJournalOnRepeatedEdits' Change-Id: I62f8d89601b8cb80bb2e14b23f0063d70913e394
2022-03-23[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-33761c75a1d240df8af3b3cd1fd22513" am: b88f171140 -s ours am: 3725791079 -s ours am: 95122d4e47 -s ours am skip reason: Merged-In Ie673edf348722de577fd491efb27973d38456997 with SHA-1 a455bf01b9 is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2036666 Change-Id: I07edc0d51ed40b3e83c41e98c1dfc92925a95c71
2022-03-23[automerger skipped] Merge "Mark ab/8191998 as merged" into ↵Xin Li
android12L-tests-dev am: 4c2ad95006 -s ours am: 2a9fd72da0 -s ours am: b894b54191 -s ours am: db430227bd -s ours am skip reason: Merged-In Ie673edf348722de577fd491efb27973d38456997 with SHA-1 a455bf01b9 is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2036666 Change-Id: Id944c781c7a56d8a6719770b2169c9154dd1cecc
2022-03-23[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-33761c75a1d240df8af3b3cd1fd22513" am: b88f171140 -s ours am: 3725791079 -s ours am skip reason: Merged-In Ie673edf348722de577fd491efb27973d38456997 with SHA-1 a455bf01b9 is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2036666 Change-Id: I55d292e93d233e3de88382a902947f14990309b3
2022-03-23[automerger skipped] Merge "Mark ab/8191998 as merged" into ↵Xin Li
android12L-tests-dev am: 4c2ad95006 -s ours am: 2a9fd72da0 -s ours am: b894b54191 -s ours am skip reason: Merged-In Ie673edf348722de577fd491efb27973d38456997 with SHA-1 a455bf01b9 is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2036666 Change-Id: Ia857d3b712b33d0301b748dedc96ef0db5c27dd5
2022-03-23[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-33761c75a1d240df8af3b3cd1fd22513" am: b88f171140 -s ours am skip reason: Merged-In Ie673edf348722de577fd491efb27973d38456997 with SHA-1 a455bf01b9 is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2036666 Change-Id: I13ed2d9808fdbb69262f958fd23b76ac58d8a56a
2022-03-23[automerger skipped] Merge "Mark ab/8191998 as merged" into ↵Xin Li
android12L-tests-dev am: 4c2ad95006 -s ours am: 2a9fd72da0 -s ours am skip reason: Merged-In Ie673edf348722de577fd491efb27973d38456997 with SHA-1 a455bf01b9 is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2036666 Change-Id: I9ea97be47fc8ee82541ce30162a11ac16fca9b36
2022-03-22Merge changes from topic "am-33761c75a1d240df8af3b3cd1fd22513"Automerger Merge Worker
* changes: [automerger skipped] Merge "Mark ab/8191998 as merged" into android12L-tests-dev am: 4c2ad95006 -s ours [automerger skipped] Mark ab/8191998 as merged am: f3206b6aca -s ours
2022-03-22[automerger skipped] Merge "Mark ab/8191998 as merged" into ↵Xin Li
android12L-tests-dev am: 4c2ad95006 -s ours am skip reason: Merged-In Ie673edf348722de577fd491efb27973d38456997 with SHA-1 a455bf01b9 is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2036666 Change-Id: I832dd1e472b82cc677bdd8ee7f7b1730036c58eb
2022-03-22[automerger skipped] Mark ab/8191998 as merged am: f3206b6aca -s oursMaria Yang
am skip reason: Merged-In Ie673edf348722de577fd491efb27973d38456997 with SHA-1 a455bf01b9 is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2036666 Change-Id: I11612d438300c70fbf7489d6d14ff8c0c5de177b
2022-03-22Merge "Mark ab/8191998 as merged" into android12L-tests-devandroid-cts-12.1_r2Xin Li
2022-03-21Mark ab/8191998 as mergedMaria Yang
Bug: 188847863 Merged-In: Ie673edf348722de577fd491efb27973d38456997 Change-Id: Ie26d073f162cccc0c08f7dc79bf66d868466a549
2021-10-08Merge "Merge "Merge "[automerger skipped] Merge "[DO NOT MERGE] Update ↵Automerger Merge Worker
ConnectionSpecTest for cipher suite removal" into pie-cts-dev am: d99a2fdd77 -s ours" into android10-tests-dev am: e401e4be0e -s ours" into android11-tests-dev am: 9de132a5d5 -s ours" into android12-tests-dev
2021-10-08Merge "Merge "[automerger skipped] Merge "[DO NOT MERGE] Update ↵Automerger Merge Worker
ConnectionSpecTest for cipher suite removal" into pie-cts-dev am: d99a2fdd77 -s ours" into android10-tests-dev am: e401e4be0e -s ours" into android11-tests-dev am: 9de132a5d5 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/1669936 Change-Id: I27299e02deadee41c86a4953a4020968b9afef77
2021-08-16[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream ↵Xin Li
am: 377a3f555c -s ours am: 0447f60a52 -s ours am skip reason: Merged-In Ic9a8a0ef59723baa08b44ad9db0dc5c695ba9578 with SHA-1 35aef1ba39 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/15546966 Change-Id: I873930317f6651de527f4ed4a14c52f174d2f81d
2021-08-15Merge "[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an ↵Automerger Merge Worker
upstream am: 377a3f555c -s ours am: a4b53a5a62 -s ours" into sc-qpr1-dev-plus-aosp am: d729d9c08a -s ours am: 0e055559ec -s ours am skip reason: Merged-In Ic9a8a0ef59723baa08b44ad9db0dc5c695ba9578 with SHA-1 35aef1ba39 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/15546966 Change-Id: I613b03d9709e3f72715de8f32f402b39954f4c2a
2021-08-15[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream ↵Xin Li
am: 377a3f555c -s ours am: 924897d2a8 -s ours am: f262467826 -s ours am: b8cc1a745d -s ours am skip reason: Merged-In Ic9a8a0ef59723baa08b44ad9db0dc5c695ba9578 with SHA-1 35aef1ba39 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/15546966 Change-Id: I1a555e56a8726f36b948c85b223e18a9d718d4bc
2021-08-15Merge "[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an ↵Automerger Merge Worker
upstream am: 377a3f555c -s ours am: a4b53a5a62 -s ours" into sc-qpr1-dev-plus-aosp am: d729d9c08a -s ours am skip reason: Merged-In Ic9a8a0ef59723baa08b44ad9db0dc5c695ba9578 with SHA-1 35aef1ba39 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/15546966 Change-Id: I1b20ae3948e5185bece671aaf613098da2cc603b
2021-08-15[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream ↵Xin Li
am: 377a3f555c -s ours am: 924897d2a8 -s ours am: f262467826 -s ours am skip reason: Merged-In Ic9a8a0ef59723baa08b44ad9db0dc5c695ba9578 with SHA-1 35aef1ba39 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/15546966 Change-Id: I874bb57ee1590392526dd8b2bcac63f6cafeaf43
2021-08-14[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream ↵Xin Li
am: 377a3f555c -s ours am: 924897d2a8 -s ours am: a455bf01b9 -s ours am: 81fa30343f -s ours am skip reason: Merged-In Ic9a8a0ef59723baa08b44ad9db0dc5c695ba9578 with SHA-1 35aef1ba39 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/15546966 Change-Id: Ia7b9a71546f6675ac5b553255327bdcc6ab4e9ab
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 20:39:42 +0000