summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-02-23Merge "Wait for helper thread to finish in MonitorContendedEntered test" ↵HEADmastermainTreehugger Robot
into main am: 92b03ef02b Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2969271 Change-Id: I8740f7fad3cd61a3e2f007648013735860895283 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-23Merge "Wait for helper thread to finish in MonitorContendedEntered test" ↵Treehugger Robot
into main
2024-02-22Wait for helper thread to finish in MonitorContendedEntered testMythri Alle
In testMonitorContendedEnteredForClassMatch, we have main thread and a helper thread contending on the same monitor. We make sure that there is contention by waiting on the main thread till the helper thread is in blocked state before releasing the lock. Though it is possible that we exit since main thread finishes before the helper thread gets a lock. This CL makes the main thread wait for the helper thread to finish. Bug: 142039794 Test: org.apache.harmony.jpda.tests.jdwp.Events_MonitorContendedEnteredTest#testMonitorContendedEnteredForClassMatch Change-Id: I430afe5372c3fea53bfd7c53e4047c57565edfa8
2023-11-27Merge "Disable a few tests that don't work with ART" into main am: ↵Mythri Alle
9561ea02cd am: 6e9f72746c am: d814e69e90 Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2846273 Change-Id: I1c460af193923c7d0383d663b67446457a8a9b9c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-27Merge "Disable a few tests that don't work with ART" into main am: ↵Mythri Alle
9561ea02cd am: abb611dcc0 am: 8964e6d498 Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2846273 Change-Id: Ibdafba836b9ee5cb60ebbfd4050b1c2c513277de Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-27Merge "Disable a few tests that don't work with ART" into main am: ↵Mythri Alle
9561ea02cd am: 6e9f72746c Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2846273 Change-Id: I7658441fb597257e3b3e385be25dc98140550022 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-27Merge "Disable a few tests that don't work with ART" into main am: ↵Mythri Alle
9561ea02cd am: abb611dcc0 Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2846273 Change-Id: I184b7ec374dd217f4cf1223a8b320e8e32b498b6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-27Merge "Disable a few tests that don't work with ART" into main am: 9561ea02cdMythri Alle
Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2846273 Change-Id: I4a0031a902d6dfc2d6c0807063baa4f9e3ae35e2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-27Merge "Disable a few tests that don't work with ART" into main am: 9561ea02cdMythri Alle
Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2846273 Change-Id: I7c59e9015a5d16b230a99fa88e40f003813ab17e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-27Merge "Disable a few tests that don't work with ART" into mainMythri Alle
2023-11-24Disable a few tests that don't work with ARTMythri Alle
There are a few checks related to passing an invalid method id / field id and expecting an invalid response. ART has never supported this. RI doesn't have the expected behaviour too. These tests are already marked as expected failures. Disabling these tests to avoid cluttering the logcat with check failures and also the tests aren't very useful in the current form to catch any errors. This CL disables following tests: org.apache.harmony.jpda.tests.jdwp.ClassType_InvokeMethodTest.testInvokeMethod002 org.apache.harmony.jpda.tests.jdwp.ClassType_InvokeMethodTest.testInvokeMethod003 org.apache.harmony.jpda.tests.jdwp.ReferenceType_GetValues002Test.testGetValues002 org.apache.harmony.jpda.tests.jdwp.ReferenceType_GetValues004Test.testGetValues004 org.apache.harmony.jpda.tests.jdwp.StringReference_ValueTest.testStringReferenceValueTest001_NullString org.apache.harmony.jpda.tests.jdwp.ClassType_InvokeMethod002Test.testInvokeMethod_wrong_argument_types Bug: 227193963 Test: art/tools/run-libjdwp-tests.sh Change-Id: If91178167139d14770220cb13d89f2456942230f
2023-09-14Merge "Make apache-harmony-tests visible to ↵Victor Chang
//libcore:libcore-non-cts-tests-txt" into main am: 410e115d62 am: 4069b35e6c am: 7f9050fda4 am: fec8bbc553 am: 3092948514 Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2748219 Change-Id: I981406629ee661a76b96534f40d3068da49ac204 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14Merge "Make apache-harmony-tests visible to ↵Victor Chang
//libcore:libcore-non-cts-tests-txt" into main am: 410e115d62 am: 4069b35e6c am: 7f9050fda4 am: fec8bbc553 Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2748219 Change-Id: Id5f8be2f11cc80ce7329fad604b9cae550878187 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14Merge "Make apache-harmony-tests visible to ↵Victor Chang
//libcore:libcore-non-cts-tests-txt" into main am: 410e115d62 am: 4069b35e6c am: 7f9050fda4 Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2748219 Change-Id: I1ab51d646d28dd0f82eb321aa71f2142a34311b6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14Merge "Make apache-harmony-tests visible to ↵Victor Chang
//libcore:libcore-non-cts-tests-txt" into main am: 410e115d62 am: 4069b35e6c Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2748219 Change-Id: I156d62a8ca6bea2593ad9c197891109f5d809704 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14Merge "Make apache-harmony-tests visible to ↵Victor Chang
//libcore:libcore-non-cts-tests-txt" into main am: 410e115d62 Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2748219 Change-Id: I72e2c684896795f289a7c6ea8da9dcb7b17fe146 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14Merge "Make apache-harmony-tests visible to ↵Victor Chang
//libcore:libcore-non-cts-tests-txt" into main
2023-09-13Make apache-harmony-tests visible to //libcore:libcore-non-cts-tests-txtVictor Chang
Bug: 287042293 Test: libcore/tools/non-cts-json-generator/update_skippedCtsTest.sh Change-Id: I1c96f40239da2c18419df239e1c5b22f989c2f95
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: d5963389b9 -s ↵Xin Li
ours am: 5f3fbe8702 -s ours am: bb353a6ed6 -s ours am: 3cfaa12623 -s ours am skip reason: Merged-In I1079096292854d1e83629141dc85b4c6c6a8b5b7 with SHA-1 dbbbe2bb18 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-harmony/+/24087539 Change-Id: If62348a4c4bcebee2b9e3dbaa83e4a031eb71563 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: d5963389b9 -s ↵Xin Li
ours am: 5f3fbe8702 -s ours am: bb353a6ed6 -s ours am skip reason: Merged-In I1079096292854d1e83629141dc85b4c6c6a8b5b7 with SHA-1 dbbbe2bb18 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-harmony/+/24087539 Change-Id: I4511198c517df3afdd9f7760ad5eaf40f4e60394 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: d5963389b9 -s ↵Xin Li
ours am: 5f3fbe8702 -s ours am skip reason: Merged-In I1079096292854d1e83629141dc85b4c6c6a8b5b7 with SHA-1 dbbbe2bb18 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-harmony/+/24087539 Change-Id: I057b953c005c3a16e552d734fc07e30bbdbd1276 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: d5963389b9 -s oursXin Li
am skip reason: Merged-In I1079096292854d1e83629141dc85b4c6c6a8b5b7 with SHA-1 dbbbe2bb18 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-harmony/+/24087539 Change-Id: I304602c9916c49bc05971cc1dc07584404f37bae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14Empty Merge Android U (ab/10368041)Xin Li
Bug: 291102124 Merged-In: I1079096292854d1e83629141dc85b4c6c6a8b5b7 Change-Id: I62f9f1bd2720ddeb18806dfdb5630f406c1c7708
2023-07-11[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-3d44934865b44d8e9d4e411e000a6a6d" into main am: 7e8438577a -s ours am: 749e075c1c -s ours am: a11c9cbc48 -s ours am: fb3006d6ad -s ours am: 82e8a69dd7 -s ours am: a3be4ad1b0 -s ours am skip reason: Merged-In I9bfd325975b4ab9b4a556adb221ab7a249f7c491 with SHA-1 73a6e79f1d is already in history Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2649236 Change-Id: I6966b7e99a1f642c836b6b99c2e97d97120fa10c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-034fc95ce8b84dba938bb10f892fdf17" into android13-tests-dev am: 963bf13603 -s ours am: 41f0220ff4 -s ours am: aa7cbeb338 -s ours am: 704023f13f -s ours am: 24091df213 -s ours am: 8aa0a638bc -s ours am: 732a20f2f7 -s ours am skip reason: Merged-In I9bfd325975b4ab9b4a556adb221ab7a249f7c491 with SHA-1 73a6e79f1d is already in history Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2649236 Change-Id: I53ef2a89852c23914428f37a88992739c3c7160b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-7f83df09354b4637be464f08bd17805d" into main am: 073095ab43 -s ours am: 01f693ab00 -s ours am: a27b87a619 -s ours am: 65006dd128 -s ours am: 2409b61b5c -s ours am: e7ab6d7536 -s ours am skip reason: Merged-In I9bfd325975b4ab9b4a556adb221ab7a249f7c491 with SHA-1 a04212067a is already in history Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2649235 Change-Id: I0eb3642547cc28c0371fca420e3e6d4083332ecd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-59d4efd6828e48808f50a364547c6b68" into android13-tests-dev am: 69b8408b9c -s ours am: 202682a772 -s ours am: 8497462166 -s ours am: 508b712f62 -s ours am: a49da2a35a -s ours am: 8b66e75d40 -s ours am: 8c43258feb -s ours am skip reason: Merged-In I9bfd325975b4ab9b4a556adb221ab7a249f7c491 with SHA-1 a04212067a is already in history Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2649235 Change-Id: I2a968ae15b8a3dd9e48a22ad52215362ccd1ecff Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-acaf53a36d95415d9693f39d48d14dd0" into main am: 4065503a08 -s ours am: a34c879b31 -s ours am: 887004a255 -s ours am: 59998ab9da -s ours am: d19aa1f561 -s ours am: b863770cf2 -s ours am skip reason: Merged-In I9bfd325975b4ab9b4a556adb221ab7a249f7c491 with SHA-1 4fcd0e3582 is already in history Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2649234 Change-Id: Ifc71192e64cba45850a5f5c2ff8b1f4addef3de3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11[automerger skipped] Merge "Fix event parsing" into android13-tests-dev am: ↵Treehugger Robot
cdfcdcfc36 -s ours am: b2f9aecb0d -s ours am: dbe55da446 -s ours am: b93c02e4d6 -s ours am: d8c5585b65 -s ours am: e45728e3b1 -s ours am: 87928dcfff -s ours am skip reason: Merged-In I9bfd325975b4ab9b4a556adb221ab7a249f7c491 with SHA-1 4fcd0e3582 is already in history Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2649234 Change-Id: I42acf1f580f28174851f36f264aa872364c647f0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-3d44934865b44d8e9d4e411e000a6a6d" into main am: 7e8438577a -s ours am: 749e075c1c -s ours am: a11c9cbc48 -s ours am: fb3006d6ad -s ours am: 82e8a69dd7 -s ours am skip reason: Merged-In I9bfd325975b4ab9b4a556adb221ab7a249f7c491 with SHA-1 73a6e79f1d is already in history Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2649236 Change-Id: Ib7481a79d4e7bd4b8ae75caf0955ce77f5a74ee3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-034fc95ce8b84dba938bb10f892fdf17" into android13-tests-dev am: 963bf13603 -s ours am: 41f0220ff4 -s ours am: aa7cbeb338 -s ours am: 704023f13f -s ours am: 24091df213 -s ours am: 8aa0a638bc -s ours am skip reason: Merged-In I9bfd325975b4ab9b4a556adb221ab7a249f7c491 with SHA-1 73a6e79f1d is already in history Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2649236 Change-Id: I938a7261ad59959eedeb923fb1a6cdb05f83a47c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-7f83df09354b4637be464f08bd17805d" into main am: 073095ab43 -s ours am: 01f693ab00 -s ours am: a27b87a619 -s ours am: 65006dd128 -s ours am: 2409b61b5c -s ours am skip reason: Merged-In I9bfd325975b4ab9b4a556adb221ab7a249f7c491 with SHA-1 a04212067a is already in history Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2649235 Change-Id: I5b99732eec9ee96ed92060ec5c2911408f623340 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-59d4efd6828e48808f50a364547c6b68" into android13-tests-dev am: 69b8408b9c -s ours am: 202682a772 -s ours am: 8497462166 -s ours am: 508b712f62 -s ours am: a49da2a35a -s ours am: 8b66e75d40 -s ours am skip reason: Merged-In I9bfd325975b4ab9b4a556adb221ab7a249f7c491 with SHA-1 a04212067a is already in history Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2649235 Change-Id: I4b5458fe18bbec6246b46e4862c3d8b8a3084d0d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-acaf53a36d95415d9693f39d48d14dd0" into main am: 4065503a08 -s ours am: a34c879b31 -s ours am: 887004a255 -s ours am: 59998ab9da -s ours am: d19aa1f561 -s ours am skip reason: Merged-In I9bfd325975b4ab9b4a556adb221ab7a249f7c491 with SHA-1 4fcd0e3582 is already in history Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2649234 Change-Id: Idff9b864418bfe5f9bd1f71dbc9e8ea4d6da57d7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11[automerger skipped] Merge "Fix event parsing" into android13-tests-dev am: ↵Treehugger Robot
cdfcdcfc36 -s ours am: b2f9aecb0d -s ours am: dbe55da446 -s ours am: b93c02e4d6 -s ours am: d8c5585b65 -s ours am: e45728e3b1 -s ours am skip reason: Merged-In I9bfd325975b4ab9b4a556adb221ab7a249f7c491 with SHA-1 4fcd0e3582 is already in history Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2649234 Change-Id: I7e03741407ed9afab8ae4fbd01948f24790228e0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-3d44934865b44d8e9d4e411e000a6a6d" into main am: 7e8438577a -s ours am: 749e075c1c -s ours am: a11c9cbc48 -s ours am: fb3006d6ad -s ours am skip reason: Merged-In I9bfd325975b4ab9b4a556adb221ab7a249f7c491 with SHA-1 73a6e79f1d is already in history Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2649236 Change-Id: I6a00a8ee5ba0b0a3f42b51c1d8e9401bef6434e8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-034fc95ce8b84dba938bb10f892fdf17" into android13-tests-dev am: 963bf13603 -s ours am: 41f0220ff4 -s ours am: aa7cbeb338 -s ours am: 704023f13f -s ours am: 24091df213 -s ours am skip reason: Merged-In I9bfd325975b4ab9b4a556adb221ab7a249f7c491 with SHA-1 73a6e79f1d is already in history Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2649236 Change-Id: I860ce193c17e7ba788669b4357d883b8fef10a75 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-7f83df09354b4637be464f08bd17805d" into main am: 073095ab43 -s ours am: 01f693ab00 -s ours am: a27b87a619 -s ours am: 65006dd128 -s ours am skip reason: Merged-In I9bfd325975b4ab9b4a556adb221ab7a249f7c491 with SHA-1 a04212067a is already in history Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2649235 Change-Id: I2ff14181549300987d4ebf130da4c1759f88dc6e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-59d4efd6828e48808f50a364547c6b68" into android13-tests-dev am: 69b8408b9c -s ours am: 202682a772 -s ours am: 8497462166 -s ours am: 508b712f62 -s ours am: a49da2a35a -s ours am skip reason: Merged-In I9bfd325975b4ab9b4a556adb221ab7a249f7c491 with SHA-1 a04212067a is already in history Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2649235 Change-Id: I06d752c118908872211f1a998ee3051559dae143 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-acaf53a36d95415d9693f39d48d14dd0" into main am: 4065503a08 -s ours am: a34c879b31 -s ours am: 887004a255 -s ours am: 59998ab9da -s ours am skip reason: Merged-In I9bfd325975b4ab9b4a556adb221ab7a249f7c491 with SHA-1 4fcd0e3582 is already in history Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2649234 Change-Id: I71a28d4dcf7a893faca51dc9875d9ecdbe3cb050 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11[automerger skipped] Merge "Fix event parsing" into android13-tests-dev am: ↵Treehugger Robot
cdfcdcfc36 -s ours am: b2f9aecb0d -s ours am: dbe55da446 -s ours am: b93c02e4d6 -s ours am: d8c5585b65 -s ours am skip reason: Merged-In I9bfd325975b4ab9b4a556adb221ab7a249f7c491 with SHA-1 4fcd0e3582 is already in history Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2649234 Change-Id: I9ed24d52102dd653fbf68283c5d1e5ea9c14a1bd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-3d44934865b44d8e9d4e411e000a6a6d" into main am: 7e8438577a -s ours am: 749e075c1c -s ours am: a11c9cbc48 -s ours am skip reason: Merged-In I9bfd325975b4ab9b4a556adb221ab7a249f7c491 with SHA-1 73a6e79f1d is already in history Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2649236 Change-Id: I46eddacf8f0cc684f8a007f0deec1d26bcd049f1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-034fc95ce8b84dba938bb10f892fdf17" into android13-tests-dev am: 963bf13603 -s ours am: 41f0220ff4 -s ours am: aa7cbeb338 -s ours am: 704023f13f -s ours am skip reason: Merged-In I9bfd325975b4ab9b4a556adb221ab7a249f7c491 with SHA-1 73a6e79f1d is already in history Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2649236 Change-Id: I11d3753db3d3aa684483d62f4da04ca244a28fbc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-7f83df09354b4637be464f08bd17805d" into main am: 073095ab43 -s ours am: 01f693ab00 -s ours am: a27b87a619 -s ours am skip reason: Merged-In I9bfd325975b4ab9b4a556adb221ab7a249f7c491 with SHA-1 a04212067a is already in history Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2649235 Change-Id: I0135dc99821cb99a4f48d8b97638f5aaafd51eae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-59d4efd6828e48808f50a364547c6b68" into android13-tests-dev am: 69b8408b9c -s ours am: 202682a772 -s ours am: 8497462166 -s ours am: 508b712f62 -s ours am skip reason: Merged-In I9bfd325975b4ab9b4a556adb221ab7a249f7c491 with SHA-1 a04212067a is already in history Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2649235 Change-Id: Ib75046be6d839c8fa46073779d72feefb0e3c5f9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-acaf53a36d95415d9693f39d48d14dd0" into main am: 4065503a08 -s ours am: a34c879b31 -s ours am: 887004a255 -s ours am skip reason: Merged-In I9bfd325975b4ab9b4a556adb221ab7a249f7c491 with SHA-1 4fcd0e3582 is already in history Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2649234 Change-Id: I9551ba8616a7528acb5c5125ba32c55dfed62d5a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10[automerger skipped] Merge "Fix event parsing" into android13-tests-dev am: ↵Treehugger Robot
cdfcdcfc36 -s ours am: b2f9aecb0d -s ours am: dbe55da446 -s ours am: b93c02e4d6 -s ours am skip reason: Merged-In I9bfd325975b4ab9b4a556adb221ab7a249f7c491 with SHA-1 4fcd0e3582 is already in history Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2649234 Change-Id: Ibb3e0e3818c10fcc94a1f9d515b41a787857a28e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-3d44934865b44d8e9d4e411e000a6a6d" into main am: 7e8438577a -s ours am: 749e075c1c -s ours am skip reason: Merged-In I9bfd325975b4ab9b4a556adb221ab7a249f7c491 with SHA-1 73a6e79f1d is already in history Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2649236 Change-Id: Id533028dbbc7c0ba0a191f5345c9dbef7317500d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-034fc95ce8b84dba938bb10f892fdf17" into android13-tests-dev am: 963bf13603 -s ours am: 41f0220ff4 -s ours am: aa7cbeb338 -s ours am skip reason: Merged-In I9bfd325975b4ab9b4a556adb221ab7a249f7c491 with SHA-1 73a6e79f1d is already in history Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2649236 Change-Id: Iffff5771052c01e50a6832cf29967c7fba33e320 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-7f83df09354b4637be464f08bd17805d" into main am: 073095ab43 -s ours am: 01f693ab00 -s ours am skip reason: Merged-In I9bfd325975b4ab9b4a556adb221ab7a249f7c491 with SHA-1 a04212067a is already in history Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2649235 Change-Id: Iff73387363d5e3c3660b8b736da015412a5761f8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 17:39:26 +0000