aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-09-19Merge "Increase mockALot timeout to 17 minutes" into android13-tests-dev am: ↵android-vts-14.0_r4android-vts-14.0_r3android-vts-14.0_r2android-cts-14.0_r4android-cts-14.0_r3android-cts-14.0_r2android14-tests-releaseandroid14-tests-devEduard Olteanu
e678c7d33a Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2744610 Change-Id: I890ce0b6a0481cf705092ab9e3cdd2b10a7c0a4c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19Merge "Increase mockALot timeout to 17 minutes" into android13-tests-devandroid13-tests-devEduard Olteanu
2023-09-08Increase mockALot timeout to 17 minutesEduard Olteanu
This is needed for low end devices (including Rohan). It was also a test improvement in b/292210010 but this is submitted with another CL that also accounts for shell timeout because the shell was getting timed out before the test finished. Bug:298611502 Test: run cts -m CtsInlineMockingTestCases -t com.android.dx.mockito.tests.Stress#mockALot Change-Id: Ida5f545ed123c1dea56e7e87efb43daf325e9470 Signed-off-by: Eduard Olteanu <eduardolteanu@google.com>
2023-07-25Increase mockALot timeout to 17 minutesyinwei.sun1
Bug: 292210010 Test: atest CtsInlineMockingTestCases Change-Id: Idd3961dcc4d01d33b7ca47f853f5e684b9382512
2022-10-26Merge "Fix errorprone warnings that should be errors" am: 4c6cbd9646 am: ↵android14-devCole Faust
cb0e023d05 am: aa85d73d5c Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2255483 Change-Id: Ie58957e6ad6dade523ac7335e89e6d0f75d03c80 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-26Merge "Fix errorprone warnings that should be errors" am: 4c6cbd9646 am: ↵android-u-beta-1-gplCole Faust
cb0e023d05 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2255483 Change-Id: I65cd7be54f57bff665b3bd685e8e5556c33a2ac0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-26Merge "Fix errorprone warnings that should be errors" am: 4c6cbd9646main-16k-with-phonesCole Faust
Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2255483 Change-Id: I58c8a85c6f0e4fab1aa0235a8a2f073f567334a1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-26Merge "Fix errorprone warnings that should be errors"Cole Faust
2022-10-25Fix errorprone warnings that should be errorsCole Faust
This commit is part of a large scale change to fix errorprone errors that have been downgraded to warnings in the android source tree, so that they can be promoted to errors again. The full list of changes include the following, but not all will be present in any one individual commit: BadAnnotationImplementation BadShiftAmount BanJNDI BoxedPrimitiveEquality ComparableType ComplexBooleanConstant CollectionToArraySafeParameter ConditionalExpressionNumericPromotion DangerousLiteralNull DoubleBraceInitialization DurationFrom DurationTemporalUnit EmptyTopLevelDeclaration EqualsNull EqualsReference FormatString FromTemporalAccessor GetClassOnAnnotation GetClassOnClass HashtableContains IdentityBinaryExpression IdentityHashMapBoxing InstantTemporalUnit InvalidTimeZoneID InvalidZoneId IsInstanceIncompatibleType JUnitParameterMethodNotFound LockOnBoxedPrimitive MathRoundIntLong MislabeledAndroidString MisusedDayOfYear MissingSuperCall MisusedWeekYear ModifyingCollectionWithItself NoCanIgnoreReturnValueOnClasses NonRuntimeAnnotation NullableOnContainingClass NullTernary OverridesJavaxInjectableMethod ParcelableCreator PeriodFrom PreconditionsInvalidPlaceholder ProtoBuilderReturnValueIgnored ProtoFieldNullComparison RandomModInteger RectIntersectReturnValueIgnored ReturnValueIgnored SelfAssignment SelfComparison SelfEquals SizeGreaterThanOrEqualsZero StringBuilderInitWithChar TreeToString TryFailThrowable UnnecessaryCheckNotNull UnusedCollectionModifiedInPlace XorPower See https://errorprone.info/bugpatterns for more information on the checks. Bug: 253827323 Test: m RUN_ERROR_PRONE=true javac-check Change-Id: I90dbb22c68efb56bc5e09114c35811805e7cf095
2022-09-26Merge "Revert^2 "Update to upstream dexmaker"" am: 60da4e1d7b am: 4497655632 ↵John Wu
am: d454288adf am: e6a513053f am: 59c84ac643 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2218809 Change-Id: I2acd251751cc65a229323ca0bc6727c1b8385193 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-26Merge "Revert^2 "Update to upstream dexmaker"" am: 60da4e1d7b am: 4497655632 ↵John Wu
am: d454288adf am: e6a513053f Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2218809 Change-Id: Ie957ba5f4f3e8341a11bae4e5bb755d0c6795bf2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-26Merge "Revert^2 "Update to upstream dexmaker"" am: 60da4e1d7b am: 4497655632 ↵John Wu
am: d454288adf Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2218809 Change-Id: I4b96e17f8a540006ad863228b3d6692e04f4918d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-26Merge "Revert^2 "Update to upstream dexmaker"" am: 60da4e1d7b am: 4497655632John Wu
Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2218809 Change-Id: I3d981ffde7ec50ed3816f569fb56e1f517e5f1b0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-26Merge "Revert^2 "Update to upstream dexmaker"" am: 60da4e1d7bJohn Wu
Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2218809 Change-Id: If9668c7a4deaf433a6d15841af7a4eff6d8adcf3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-26Merge "Revert^2 "Update to upstream dexmaker""John Wu
2022-09-26Revert^2 "Update to upstream dexmaker"John Wu
Cherry-pick "Do not read Build.VERSION to allow non-standard Android distributions (Ia8c4ba4c82cd6f193c565f1bfe48faffc4aac08f)" to fix ART host tests. 783d1254b1698492fd8ae7e04a20115d1283ba60 Change-Id: Iec6a60d0016f50101fe9151931065dc04148c767
2022-09-20Merge "Revert "Update to upstream dexmaker"" am: 6f5561ba7b am: d30351c99c ↵Nicolas Geoffray
am: 79aba3b995 am: 7213f34055 am: 7fc0cee7c5 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2216810 Change-Id: Ibe5557fc7a7f6ba49b6e6cd527474edce4349889 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20Merge "Update to upstream dexmaker" am: c184f17a94 am: cdd9c2d31f am: ↵John Wu
1d86ea6286 am: bdbe2a83d9 am: 6fa21669c5 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2128792 Change-Id: Id49ea2631147698ce7f787589f8d3d2fb1f603a6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20Merge "Revert "Update to upstream dexmaker"" am: 6f5561ba7b am: d30351c99c ↵Nicolas Geoffray
am: 79aba3b995 am: 7213f34055 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2216810 Change-Id: I2651a6e6817c811080dbee496f9beefc972cb7bc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20Merge "Update to upstream dexmaker" am: c184f17a94 am: cdd9c2d31f am: ↵John Wu
1d86ea6286 am: bdbe2a83d9 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2128792 Change-Id: I654b7e5e22a621ca0ae036efa9fe94d3149849a8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20Merge "Revert "Update to upstream dexmaker"" am: 6f5561ba7b am: d30351c99c ↵Nicolas Geoffray
am: 79aba3b995 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2216810 Change-Id: I2b9c951c881dcfef6b6d95978049b22f5576f1e7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20Merge "Update to upstream dexmaker" am: c184f17a94 am: cdd9c2d31f am: 1d86ea6286John Wu
Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2128792 Change-Id: I8d616471c4bb2d9f00154d6043bf2de6fd0eb522 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20Merge "Revert "Update to upstream dexmaker"" am: 6f5561ba7b am: d30351c99cNicolas Geoffray
Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2216810 Change-Id: I687272809294029ac2549096058bf2e8bc247110 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20Merge "Update to upstream dexmaker" am: c184f17a94 am: cdd9c2d31fJohn Wu
Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2128792 Change-Id: Ia0cb81ecb509cc8442aee4619cee9e4359dc9864 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15Merge "Revert "Update to upstream dexmaker"" am: 6f5561ba7bNicolas Geoffray
Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2216810 Change-Id: I425e325643879e2e1d2b92eececd29b42d8d37a8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15Merge "Revert "Update to upstream dexmaker""Nicolas Geoffray
2022-09-15Revert "Update to upstream dexmaker"Hans Boehm
Revert "Update CTS tests" Revert "Enforce files loaded in DexFile to be read-only" Revert "Enforce files loaded in DexFile to be read-only" Revert submission 2086507-ro_java_dcl Reason for revert: Causes ART host tests to fail. Reverted Changes: I736ccfb6d:Update CTS tests Ie081df900:Update to upstream dexmaker Id635fbc79:Enforce files loaded in DexFile to be read-only I700af94d4:Enforce files loaded in DexFile to be read-only Change-Id: I459aeb8ec63836200dd68596a5adbb5c4d9a56b5
2022-09-14Merge "Update to upstream dexmaker" am: c184f17a94John Wu
Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2128792 Change-Id: Ie79c7536ab7a22485eec71f6f92ba1567e011988 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14Merge "Update to upstream dexmaker"John Wu
2022-09-12Update to upstream dexmakerJohn Wu
New changes are submitted upstream to support latest Java DCL restrictions added to the platform. Test: m Bug: 218865702 Change-Id: Ie081df9004c01d9e4e1bcefba22cce3d92f49d4a
2022-03-23[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-33761c75a1d240df8af3b3cd1fd22513" am: 8ef77d1ec9 -s ours am: a397a3f55e -s ours am: e8bcd8101e -s ours am: ecb8636406 -s ours am: 52f1a10498 -s ours am skip reason: Merged-In I58432a055843e851137bced523aa52ec32d63d0f with SHA-1 51c0301f9f is already in history Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2037244 Change-Id: Ib98d06aefc112f8d97a37f300080a8f1d9aafcb7
2022-03-23[automerger skipped] Merge "Mark ab/8191998 as merged" into ↵Xin Li
android12L-tests-dev am: c962e4316e -s ours am: 4d6896caf6 -s ours am: b704d7b140 -s ours am: 901b848b4b -s ours am: 6124ea4118 -s ours am: 9a89c17126 -s ours am skip reason: Merged-In I58432a055843e851137bced523aa52ec32d63d0f with SHA-1 51c0301f9f is already in history Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2037244 Change-Id: I11c6f68e4513551aff6e5bffdf765e96816400c1
2022-03-23[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-33761c75a1d240df8af3b3cd1fd22513" am: 8ef77d1ec9 -s ours am: a397a3f55e -s ours am: e8bcd8101e -s ours am: ecb8636406 -s ours am skip reason: Merged-In I58432a055843e851137bced523aa52ec32d63d0f with SHA-1 51c0301f9f is already in history Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2037244 Change-Id: I9bcaa95ceed4bee1e10f3485e94f6d0144941964
2022-03-23[automerger skipped] Merge "Mark ab/8191998 as merged" into ↵Xin Li
android12L-tests-dev am: c962e4316e -s ours am: 4d6896caf6 -s ours am: b704d7b140 -s ours am: 901b848b4b -s ours am: 6124ea4118 -s ours am skip reason: Merged-In I58432a055843e851137bced523aa52ec32d63d0f with SHA-1 51c0301f9f is already in history Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2037244 Change-Id: Ie71805c4629069b7de9122d0ccaac668f2f9f33c
2022-03-23[automerger skipped] Merge changes from topic ↵aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000android13-mainline-tzdata4-releaseAutomerger Merge Worker
"am-33761c75a1d240df8af3b3cd1fd22513" am: 8ef77d1ec9 -s ours am: a397a3f55e -s ours am: e8bcd8101e -s ours am: ecb8636406 -s ours am skip reason: Merged-In I58432a055843e851137bced523aa52ec32d63d0f with SHA-1 51c0301f9f is already in history Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2037244 Change-Id: Ia4100b4f3f368c7cf602c56fc7f48ae7788b8c6f
2022-03-23[automerger skipped] Merge "Mark ab/8191998 as merged" into ↵Xin Li
android12L-tests-dev am: c962e4316e -s ours am: 4d6896caf6 -s ours am: b704d7b140 -s ours am: 901b848b4b -s ours am: 6124ea4118 -s ours am skip reason: Merged-In I58432a055843e851137bced523aa52ec32d63d0f with SHA-1 51c0301f9f is already in history Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2037244 Change-Id: I355c5b9836376e807ecfcb912920a1334bb94ca9
2022-03-23[automerger skipped] Merge changes from topic ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-vts-13.0_r5android-vts-13.0_r4android-vts-13.0_r3android-vts-13.0_r2android-cts-13.0_r5android-cts-13.0_r4android-cts-13.0_r3android-cts-13.0_r2android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-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_r32aml_go_odp_330912000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-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-releaseandroid13-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-releaseandroid13-mainline-go-adservices-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseAutomerger Merge Worker
"am-33761c75a1d240df8af3b3cd1fd22513" am: 8ef77d1ec9 -s ours am: a397a3f55e -s ours am: e8bcd8101e -s ours am skip reason: Merged-In I58432a055843e851137bced523aa52ec32d63d0f with SHA-1 51c0301f9f is already in history Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2037244 Change-Id: I5968970ee9f347e59bf836c1a241094e882b4823
2022-03-23[automerger skipped] Merge "Mark ab/8191998 as merged" into ↵Xin Li
android12L-tests-dev am: c962e4316e -s ours am: 4d6896caf6 -s ours am: b704d7b140 -s ours am: 901b848b4b -s ours am skip reason: Merged-In I58432a055843e851137bced523aa52ec32d63d0f with SHA-1 51c0301f9f is already in history Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2037244 Change-Id: I4f22c7a9ebf81cc21ccc9a9c74e05c3aa57c2e66
2022-03-23[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-33761c75a1d240df8af3b3cd1fd22513" am: 8ef77d1ec9 -s ours am: a397a3f55e -s ours am skip reason: Merged-In I58432a055843e851137bced523aa52ec32d63d0f with SHA-1 51c0301f9f is already in history Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2037244 Change-Id: I01f248156d1ff58a7ff665e7655bc0efac954e7e
2022-03-23[automerger skipped] Merge "Mark ab/8191998 as merged" into ↵Xin Li
android12L-tests-dev am: c962e4316e -s ours am: 4d6896caf6 -s ours am: b704d7b140 -s ours am skip reason: Merged-In I58432a055843e851137bced523aa52ec32d63d0f with SHA-1 51c0301f9f is already in history Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2037244 Change-Id: I6a9d74800d32de4af07fbd0dabb95927325076f3
2022-03-23[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-33761c75a1d240df8af3b3cd1fd22513" am: 8ef77d1ec9 -s ours am skip reason: Merged-In I58432a055843e851137bced523aa52ec32d63d0f with SHA-1 51c0301f9f is already in history Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2037244 Change-Id: Ie2407d88685b7e5d7cf6b9ef449feec984ef19b7
2022-03-23[automerger skipped] Merge "Mark ab/8191998 as merged" into ↵Xin Li
android12L-tests-dev am: c962e4316e -s ours am: 4d6896caf6 -s ours am skip reason: Merged-In I58432a055843e851137bced523aa52ec32d63d0f with SHA-1 51c0301f9f is already in history Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2037244 Change-Id: I6af25b2eae1fd2d34485d5bf8489332c119531e9
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: c962e4316e -s ours [automerger skipped] Mark ab/8191998 as merged am: 8b71700404 -s ours
2022-03-22[automerger skipped] Merge "Mark ab/8191998 as merged" into ↵Xin Li
android12L-tests-dev am: c962e4316e -s ours am skip reason: Merged-In I58432a055843e851137bced523aa52ec32d63d0f with SHA-1 51c0301f9f is already in history Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2037244 Change-Id: Id88d6559d0d64e1ab16d542659ef721c4f155f1e
2022-03-22[automerger skipped] Mark ab/8191998 as merged am: 8b71700404 -s oursMaria Yang
am skip reason: Merged-In I58432a055843e851137bced523aa52ec32d63d0f with SHA-1 51c0301f9f is already in history Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2037244 Change-Id: I4e39255019bce25ff8e429d69311dbefea5d0ffd
2022-03-22Merge "Mark ab/8191998 as merged" into android12L-tests-devandroid-vts-12.1_r9android-vts-12.1_r8android-vts-12.1_r7android-vts-12.1_r6android-vts-12.1_r5android-vts-12.1_r4android-vts-12.1_r3android-vts-12.1_r2android-vts-12.1_r10android-cts-12.1_r9android-cts-12.1_r8android-cts-12.1_r7android-cts-12.1_r6android-cts-12.1_r5android-cts-12.1_r4android-cts-12.1_r3android-cts-12.1_r2android-cts-12.1_r10android12L-tests-releaseandroid12L-tests-devXin Li
2022-03-21Mark ab/8191998 as mergedMaria Yang
Bug: 188847863 Merged-In: I58432a055843e851137bced523aa52ec32d63d0f Change-Id: Ie1fc7f28b94bf33ab1e5e6956f0f85c68e91b6a3
2021-10-09Merge "Merge "[automerger skipped] Merge "Extend the Stress#mockALot() ↵android12-tests-devAutomerger Merge Worker
timeout for CTS." into android10-tests-dev am: e7943198e6 -s ours" into android11-tests-dev am: 41d9b29e93 -s ours" into android12-tests-dev
2021-10-09Merge "[automerger skipped] Merge "Extend the Stress#mockALot() timeout for ↵Automerger Merge Worker
CTS." into android10-tests-dev am: e7943198e6 -s ours" into android11-tests-dev am: 41d9b29e93 -s ours am skip reason: Merged-In Iad30a8cb07b38054b490b7006d11908fc752a024 with SHA-1 f53c14723c is already in history Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/1125551 Change-Id: Ie1b29a8c69ba23b401777eef4a56a7fcf6eeddca
2021-10-09Merge "Merge "Snap for 5706892 from 437135ef1f78189da10a6a4ebfc8c380c68c2aa7 ↵Automerger Merge Worker
to qt-release am: a82c36e1ee" into android11-tests-dev am: 5a38bb2926" into android12-tests-dev
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 05:27:52 +0000