aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2021-10-09Merge "Snap for 5706892 from 437135ef1f78189da10a6a4ebfc8c380c68c2aa7 to ↵Automerger Merge Worker
qt-release am: a82c36e1ee" into android11-tests-dev am: 5a38bb2926 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dexmaker/+/8460213 Change-Id: Ie226480d09b3ab65c0251ff97e32a85a1359247c
2021-10-09Merge "Merge "Snap for 5413448 from 70e0e5f61a36ed0c5058b4fe08cf68a949f714c5 ↵Automerger Merge Worker
to qt-release am: 4b0f6ed3ad" into android11-tests-dev am: a015250f60" into android12-tests-dev
2021-10-09Merge "Snap for 5413448 from 70e0e5f61a36ed0c5058b4fe08cf68a949f714c5 to ↵Automerger Merge Worker
qt-release am: 4b0f6ed3ad" into android11-tests-dev am: a015250f60 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dexmaker/+/6858087 Change-Id: I1236caea43eb210937866b82981a8161b8cf02f2
2021-10-09Merge "Merge "Snap for 5370966 from 5feb0ca8158ff0b53605c094a045bf340f93856f ↵Automerger Merge Worker
to qt-release am: 8144d8a5f3" into android11-tests-dev am: e3d2d9cdc3" into android12-tests-dev
2021-10-09Merge "Snap for 5370966 from 5feb0ca8158ff0b53605c094a045bf340f93856f to ↵Automerger Merge Worker
qt-release am: 8144d8a5f3" into android11-tests-dev am: e3d2d9cdc3 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dexmaker/+/6710729 Change-Id: Idfb9b9b240dde133ef2a36f8c73b106ff7fedddf
2021-10-09Merge "Merge "Snap for 5351881 from 58658887822e3eeb593394a6bc0144702900679d ↵Automerger Merge Worker
to qt-release am: 7e5a866431" into android11-tests-dev am: fe87eb47d5" into android12-tests-dev
2021-10-09Merge "Snap for 5351881 from 58658887822e3eeb593394a6bc0144702900679d to ↵Automerger Merge Worker
qt-release am: 7e5a866431" into android11-tests-dev am: fe87eb47d5 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dexmaker/+/6632097 Change-Id: I3e616291072c373ff0c2c0813ecb32e391ee8f58
2021-10-09Merge "Merge "Snap for 5339364 from 8d384cfa4684e3180d9dc60f7ab4eb47f3326a5c ↵Automerger Merge Worker
to qt-release am: a679d110cd" into android11-tests-dev am: 4469abe9d4" into android12-tests-dev
2021-10-09Merge "Snap for 5339364 from 8d384cfa4684e3180d9dc60f7ab4eb47f3326a5c to ↵Automerger Merge Worker
qt-release am: a679d110cd" into android11-tests-dev am: 4469abe9d4 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dexmaker/+/6552681 Change-Id: I92619692835e57430d8d84fcbb28a30ea1ed49d5
2021-10-09Merge "Merge "Snap for 5335706 from 3bddfea6418f55a57acb493784c1ac39738d0988 ↵Automerger Merge Worker
to qt-release am: 5bda3399da" into android11-tests-dev am: 04342cf673" into android12-tests-dev
2021-10-09Merge "Snap for 5335706 from 3bddfea6418f55a57acb493784c1ac39738d0988 to ↵Automerger Merge Worker
qt-release am: 5bda3399da" into android11-tests-dev am: 04342cf673 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dexmaker/+/6536466 Change-Id: I37cf1cdd16ae1e97c15b30e1de7561a36a48921e
2021-10-09Merge "Merge "Snap for 5282916 from b29beff4e4a5d4541a20c3950bf03ddd268ce67f ↵Automerger Merge Worker
to qt-release am: b1c90aaa5d" into android11-tests-dev am: 26210c287c" into android12-tests-dev
2021-10-09Merge "Snap for 5282916 from b29beff4e4a5d4541a20c3950bf03ddd268ce67f to ↵Automerger Merge Worker
qt-release am: b1c90aaa5d" into android11-tests-dev am: 26210c287c Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dexmaker/+/6264716 Change-Id: I02e5c4dcdbdbb89445213ce2247c1a859db82e51
2021-10-09Merge "Merge "Snap for 5273885 from 2b58ea68909cf908246ac09496e79c7132c1325e ↵Automerger Merge Worker
to qt-release am: 1b3ad51a4e" into android11-tests-dev am: 7f7ceae605" into android12-tests-dev
2021-10-09Merge "Snap for 5273885 from 2b58ea68909cf908246ac09496e79c7132c1325e to ↵Automerger Merge Worker
qt-release am: 1b3ad51a4e" into android11-tests-dev am: 7f7ceae605 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dexmaker/+/6227028 Change-Id: I29e0a77c018a3d80726f1d7b81b0978935bb7190
2021-10-09Merge "Merge "Snap for 5254928 from e1225de56738dabae7178c31ba0607fd26fa7a7e ↵Automerger Merge Worker
to qt-release am: 5e8e4c8e00" into android11-tests-dev am: 95655545f9" into android12-tests-dev
2021-10-09Merge "Snap for 5254928 from e1225de56738dabae7178c31ba0607fd26fa7a7e to ↵Automerger Merge Worker
qt-release am: 5e8e4c8e00" into android11-tests-dev am: 95655545f9 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dexmaker/+/6153323 Change-Id: I5906f4acd83b9b39014364f8916a38b3707cac35
2021-10-09Merge "Merge "Snap for 5214914 from 03a9daf5f12283c6ec14a2e3718886749fda3c71 ↵Automerger Merge Worker
to qt-release am: 34696322a0" into android11-tests-dev am: 663abee8c9" into android12-tests-dev
2021-10-09Merge "Snap for 5214914 from 03a9daf5f12283c6ec14a2e3718886749fda3c71 to ↵Automerger Merge Worker
qt-release am: 34696322a0" into android11-tests-dev am: 663abee8c9 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dexmaker/+/5969740 Change-Id: If2af3a2050fbfb4965449a1a5f7b958c287640ad
2021-10-09Merge "Merge "Snap for 5171533 from 5d2f7f02aeb9c5d61bf828d960428191c4fdb762 ↵Automerger Merge Worker
to qt-release am: 8c4894e237" into android11-tests-dev am: 1b69cfaa0e" into android12-tests-dev
2021-10-09Merge "Snap for 5171533 from 5d2f7f02aeb9c5d61bf828d960428191c4fdb762 to ↵Automerger Merge Worker
qt-release am: 8c4894e237" into android11-tests-dev am: 1b69cfaa0e Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dexmaker/+/5755924 Change-Id: I9cdfe406c487a8a29323af1ea2bf12f2e929e72c
2021-10-09Merge "Merge "Snap for 5117548 from 59a86bdb388f6f5027e72057a8ca79851663e4ee ↵Automerger Merge Worker
to qt-release am: 6405f7ae73" into android11-tests-dev am: 94181cc8fd" into android12-tests-dev
2021-10-09Merge "Snap for 5117548 from 59a86bdb388f6f5027e72057a8ca79851663e4ee to ↵Automerger Merge Worker
qt-release am: 6405f7ae73" into android11-tests-dev am: 94181cc8fd Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dexmaker/+/5465841 Change-Id: I2ceefd234252d20f6584f291564001269301fabe
2021-10-09Merge "Merge "Snap for 5096429 from dec9676e425e46ba901515956ad6817d27533a7e ↵Automerger Merge Worker
to qt-release am: e61717fd5d" into android11-tests-dev am: 88391072c4" into android12-tests-dev
2021-10-09Merge "Snap for 5096429 from dec9676e425e46ba901515956ad6817d27533a7e to ↵Automerger Merge Worker
qt-release am: e61717fd5d" into android11-tests-dev am: 88391072c4 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dexmaker/+/5378133 Change-Id: I34ec61e754f8bbed005fb591c38e458387ac0c0b
2021-10-09Merge "Merge "Snap for 5090430 from 47e13ad15b68b5f6d2edb63a9dca9d6adb0b410a ↵Automerger Merge Worker
to qt-release am: 303a1089f3" into android11-tests-dev am: 79822086dd" into android12-tests-dev
2021-10-09Merge "Snap for 5090430 from 47e13ad15b68b5f6d2edb63a9dca9d6adb0b410a to ↵Automerger Merge Worker
qt-release am: 303a1089f3" into android11-tests-dev am: 79822086dd Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dexmaker/+/5352700 Change-Id: Idacd196a928d707a63c2e9eb792a93f129ecc8f2
2021-10-09Merge "Merge "Snap for 5075986 from f28e08b40a5460c81bd94558c14a925124b9a4c3 ↵Automerger Merge Worker
to qt-release am: 00cfb5cef0" into android11-tests-dev am: 33d6672c18" into android12-tests-dev
2021-10-09Merge "Snap for 5075986 from f28e08b40a5460c81bd94558c14a925124b9a4c3 to ↵Automerger Merge Worker
qt-release am: 00cfb5cef0" into android11-tests-dev am: 33d6672c18 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dexmaker/+/5299852 Change-Id: I63598a8fc704af59156bf8be1ddd474ea98213ee
2021-10-09Merge "Merge "Snap for 5067452 from 0472bce71c953e8ec68dd58b0523ea77f744e8ba ↵Automerger Merge Worker
to qt-release am: 96b1a7d40a" into android11-tests-dev am: bf05711ad6" into android12-tests-dev
2021-10-09Merge "Snap for 5067452 from 0472bce71c953e8ec68dd58b0523ea77f744e8ba to ↵Automerger Merge Worker
qt-release am: 96b1a7d40a" into android11-tests-dev am: bf05711ad6 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dexmaker/+/5262703 Change-Id: I44526ea4db6fde8323131e5a6095fb8b34981970
2021-10-09Merge "Merge "Snap for 5000538 from 618e9c52ddf73dfd976664b7b19ea6fd3e77aa59 ↵Automerger Merge Worker
to qt-release am: 6980c88fe8" into android11-tests-dev am: acb124feee" into android12-tests-dev
2021-10-09Merge "Snap for 5000538 from 618e9c52ddf73dfd976664b7b19ea6fd3e77aa59 to ↵Automerger Merge Worker
qt-release am: 6980c88fe8" into android11-tests-dev am: acb124feee Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dexmaker/+/4978735 Change-Id: I7abf87454413ed8ba86557e07a44ff71b1778c30
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 04:44:24 +0000