aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: f1d510cca0 -s ours ↵aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000android13-mainline-tzdata4-releaseaml_tz4_332714010Xin Li
am: c13941a760 -s ours am: 911ce8903f -s ours am skip reason: Merged-In I1ec8d6440629e4198a5116641d9074906c6a5ebb with SHA-1 123007c428 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/trebuchet/+/17544699 Change-Id: I18d322958428f8010cfc7659fe515b536af25ec9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: f1d510cca0 -s ours ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010main-16kandroid13-tests-devandroid13-frc-odp-releaseandroid13-devXin Li
am: c13941a760 -s ours am skip reason: Merged-In I1ec8d6440629e4198a5116641d9074906c6a5ebb with SHA-1 123007c428 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/trebuchet/+/17544699 Change-Id: I989142219a2061b56781d31613f4d121d818bb23 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: f1d510cca0 -s oursXin Li
am skip reason: Merged-In I1ec8d6440629e4198a5116641d9074906c6a5ebb with SHA-1 123007c428 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/trebuchet/+/17544699 Change-Id: If1ed4a94fec4842ae643fd5d1cc2db21b5a2a467 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge Android 12 QPR3 ab/8391262Xin Li
Bug: 226662282 Merged-In: I1ec8d6440629e4198a5116641d9074906c6a5ebb Change-Id: Ia42802a93fee1495e7e0757b88806bf83d47a1b3
2022-03-30[automerger skipped] Update ftrace parser for kernel 5.15 changes am: ↵John Reck
09f6f074e4 am: 736f05ccb6 am: 123007c428 -s ours am: b7e13719be -s ours am skip reason: Merged-In I7f11cb530f8f359cfea09b29b496a34e961d87fc with SHA-1 ad1e70c0ff is already in history Original change: https://android-review.googlesource.com/c/platform/tools/trebuchet/+/2048863 Change-Id: I6b59424123bd87ba062817fffe938d2b5eee3354 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30[automerger skipped] Update ftrace parser for kernel 5.15 changes am: ↵John Reck
09f6f074e4 am: 736f05ccb6 am: 123007c428 -s ours am skip reason: Merged-In I7f11cb530f8f359cfea09b29b496a34e961d87fc with SHA-1 ad1e70c0ff is already in history Original change: https://android-review.googlesource.com/c/platform/tools/trebuchet/+/2048863 Change-Id: I3261609432b8615fd0882619ef7e89f4aa135a13 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30Update ftrace parser for kernel 5.15 changes am: 09f6f074e4 am: 736f05ccb6John Reck
Original change: https://android-review.googlesource.com/c/platform/tools/trebuchet/+/2048863 Change-Id: I1ec8d6440629e4198a5116641d9074906c6a5ebb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30Update ftrace parser for kernel 5.15 changes am: 09f6f074e4John Reck
Original change: https://android-review.googlesource.com/c/platform/tools/trebuchet/+/2048863 Change-Id: Ia626fb6ef2955ee0012d1994ea55db8aa9cabbea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30Update ftrace parser for kernel 5.15 changes am: ad1e70c0ffJohn Reck
Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/trebuchet/+/17486764 Change-Id: Iab0df9d0456e93f690232e7a0180542a84091d26 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30Update ftrace parser for kernel 5.15 changesJohn Reck
Test: FtraceImporterTest passes Fixes: 223537267 Change-Id: I7f11cb530f8f359cfea09b29b496a34e961d87fc Merged-In: I7f11cb530f8f359cfea09b29b496a34e961d87fc
2022-03-29Update ftrace parser for kernel 5.15 changesJohn Reck
Test: FtraceImporterTest passes Fixes: 223537267 Change-Id: I7f11cb530f8f359cfea09b29b496a34e961d87fc
2021-05-27Merge sc-mainline-prod to master.Bill Rassieur
Change-Id: Ib09634b12312059628651aff1f890b8af5d7d7ce
2021-05-19Revert^2 "Fix usage of minBy to unblock Kotlin 1.5 upgrade" am: 060dea15b0 ↵Aurimas Liutikas
am: ce196881e9 am: 07b133200e Original change: https://android-review.googlesource.com/c/platform/tools/trebuchet/+/1709772 Change-Id: I8ecf15065e7feb1df8f39d81430fe048ca4d51bc
2021-05-19Revert "Fix usage of minBy to unblock Kotlin 1.5 upgrade" am: 375f839d08 am: ↵Aurimas Liutikas
096f1a5ab5 am: f4b3ef341e am: 6d2c711220 am: e935209791 Original change: https://android-review.googlesource.com/c/platform/tools/trebuchet/+/1705634 Change-Id: Icb955a684a3a4cea53374d743c44aa146a9aa37d
2021-05-19Fix usage of minBy to unblock Kotlin 1.5 upgrade am: 6e914b3fe5 am: ↵Aurimas Liutikas
b8f6cdd074 am: de6c7e8d3a am: f39cee6412 am: 7a300d01d1 Original change: https://android-review.googlesource.com/c/platform/tools/trebuchet/+/1697313 Change-Id: I1d57fe8dbbe4bc57f922d4beea7fb654d70e063a
2021-05-19Remove explicit TEST_MAPPING file for trebuchet-core am: a2ce1af715 am: ↵Julien Desprez
8fd02ed7da am: d3eafff21c am: 89917b1787 am: b29f96ed75 Original change: https://android-review.googlesource.com/c/platform/tools/trebuchet/+/1690952 Change-Id: I595a5f480e906f81f7e7acf907897d80e8f59de3
2021-05-18Revert^2 "Fix usage of minBy to unblock Kotlin 1.5 upgrade" am: 060dea15b0 ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Aurimas Liutikas
am: ce196881e9 Original change: https://android-review.googlesource.com/c/platform/tools/trebuchet/+/1709772 Change-Id: Iefb96d7ecf1f36b89358e19eb95e6be2bf99a08e
2021-05-18Revert^2 "Fix usage of minBy to unblock Kotlin 1.5 upgrade" am: 060dea15b0android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Aurimas Liutikas
Original change: https://android-review.googlesource.com/c/platform/tools/trebuchet/+/1709772 Change-Id: I1997672dd10fffd4357fddf300fff312d947adc4
2021-05-18Revert "Fix usage of minBy to unblock Kotlin 1.5 upgrade" am: 375f839d08 am: ↵Aurimas Liutikas
096f1a5ab5 am: f4b3ef341e am: 6d2c711220 am: 0fc703a311 am: 713f081631 Original change: https://android-review.googlesource.com/c/platform/tools/trebuchet/+/1705634 Change-Id: I366ded200321ec912244859d46233d649d313b27
2021-05-18Fix usage of minBy to unblock Kotlin 1.5 upgrade am: 6e914b3fe5 am: ↵Aurimas Liutikas
b8f6cdd074 am: de6c7e8d3a am: f39cee6412 am: 4fabfe75cd am: 1fd5d0fc7c Original change: https://android-review.googlesource.com/c/platform/tools/trebuchet/+/1697313 Change-Id: Ice7ecbc2a582abb1036e766d16cdf2fd43a4ee22
2021-05-17Revert^2 "Fix usage of minBy to unblock Kotlin 1.5 upgrade"Aurimas Liutikas
375f839d08f42cde0da7d623a44d0d082610662d Change-Id: I53feb190c7ffde6233af88f325b858d866eb0734
2021-05-15Remove explicit TEST_MAPPING file for trebuchet-core am: a2ce1af715 am: ↵Julien Desprez
8fd02ed7da am: d3eafff21c am: 89917b1787 am: 57fb2179ff am: cc26b389fc Original change: https://android-review.googlesource.com/c/platform/tools/trebuchet/+/1690952 Change-Id: Ib07e4dd6664b199c78a5b1be745515cca2312b63
2021-05-15[automerger skipped] Cherry-pick: Remove obsolete tests am: 24b211b32a am: ↵Julien Desprez
9c8bdb47f8 am: a8eb4519e4 -s ours am: a0f11f91af -s ours am: 4372ec4fe7 -s ours am skip reason: Merged-In Ic52953362d5296462467e1f7a5e17f19129ed137 with SHA-1 4a15ed23b1 is already in history Original change: https://android-review.googlesource.com/c/platform/tools/trebuchet/+/1686436 Change-Id: I3674cb795821ed2714f60bfa57a497b4b960f5f0
2021-05-15Remove obsolete tests am: 4a15ed23b1 am: 745afceca7John Reck
Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/trebuchet/+/14235122 Change-Id: I163033a4da3d137058b72632901ee77dea3afc8b
2021-05-12Revert "Fix usage of minBy to unblock Kotlin 1.5 upgrade" am: 375f839d08 am: ↵Aurimas Liutikas
096f1a5ab5 am: f4b3ef341e am: 6d2c711220 am: 0fc703a311 Original change: https://android-review.googlesource.com/c/platform/tools/trebuchet/+/1705634 Change-Id: Ia6a5ed2855892d54b042148796f9144dc193e091
2021-05-12Revert "Fix usage of minBy to unblock Kotlin 1.5 upgrade" am: 375f839d08 am: ↵Aurimas Liutikas
096f1a5ab5 am: f4b3ef341e am: 6d2c711220 Original change: https://android-review.googlesource.com/c/platform/tools/trebuchet/+/1705634 Change-Id: I40cffd8af34bb667c85d3c8f882abb1ee4602fd9
2021-05-12Revert "Fix usage of minBy to unblock Kotlin 1.5 upgrade" am: 375f839d08 am: ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseAurimas Liutikas
096f1a5ab5 am: f4b3ef341e am: 6d2c711220 Original change: https://android-review.googlesource.com/c/platform/tools/trebuchet/+/1705634 Change-Id: I1b035bd8290f77548fce0d8e8106a6babbf6e31a
2021-05-12Revert "Fix usage of minBy to unblock Kotlin 1.5 upgrade" am: 375f839d08 am: ↵Aurimas Liutikas
096f1a5ab5 am: f4b3ef341e am: 6d2c711220 Original change: https://android-review.googlesource.com/c/platform/tools/trebuchet/+/1705634 Change-Id: I60baf5f728209c9a4e9742be1ab0e31d205b66c0
2021-05-12Revert "Fix usage of minBy to unblock Kotlin 1.5 upgrade" am: 375f839d08 am: ↵Aurimas Liutikas
096f1a5ab5 am: f4b3ef341e am: 6d2c711220 Original change: https://android-review.googlesource.com/c/platform/tools/trebuchet/+/1705634 Change-Id: If2d9eaf01edcebf811cc17df4c4ea771df6ad8f7
2021-05-12Revert "Fix usage of minBy to unblock Kotlin 1.5 upgrade" am: 375f839d08 am: ↵android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseAurimas Liutikas
096f1a5ab5 am: f4b3ef341e Original change: https://android-review.googlesource.com/c/platform/tools/trebuchet/+/1705634 Change-Id: Ia58e9c22513010705ca9a9ab09068d12f704846d
2021-05-12Revert "Fix usage of minBy to unblock Kotlin 1.5 upgrade" am: 375f839d08 am: ↵Aurimas Liutikas
096f1a5ab5 Original change: https://android-review.googlesource.com/c/platform/tools/trebuchet/+/1705634 Change-Id: I71f29322af68e04159d062fa0e8d8e04f06f11f2
2021-05-12Revert "Fix usage of minBy to unblock Kotlin 1.5 upgrade" am: 375f839d08Aurimas Liutikas
Original change: https://android-review.googlesource.com/c/platform/tools/trebuchet/+/1705634 Change-Id: I68546db96c7386a02df011d87407ca1c0b07a2ca
2021-05-12Revert "Fix usage of minBy to unblock Kotlin 1.5 upgrade"android-s-beta-2android-s-beta-1Aurimas Liutikas
This reverts commit 6e914b3fe586f61c24e5add5e903a375be94f756. Reason for revert: b/187908823 Change-Id: I12da9f0984d68b8335ff88c83b5a721c0922495d
2021-05-11Fix usage of minBy to unblock Kotlin 1.5 upgrade am: 6e914b3fe5 am: ↵Aurimas Liutikas
b8f6cdd074 am: de6c7e8d3a am: f39cee6412 am: 4fabfe75cd Original change: https://android-review.googlesource.com/c/platform/tools/trebuchet/+/1697313 Change-Id: I7202b47d1b4ae2cb5f15629cc44976318bda7b70
2021-05-11Fix usage of minBy to unblock Kotlin 1.5 upgrade am: 6e914b3fe5 am: ↵Aurimas Liutikas
b8f6cdd074 am: de6c7e8d3a am: f39cee6412 Original change: https://android-review.googlesource.com/c/platform/tools/trebuchet/+/1697313 Change-Id: I9d690e5af8ba60e6de32b6cc076f79dc8a9cb803
2021-05-11Fix usage of minBy to unblock Kotlin 1.5 upgrade am: 6e914b3fe5 am: ↵Aurimas Liutikas
b8f6cdd074 am: de6c7e8d3a am: f39cee6412 Original change: https://android-review.googlesource.com/c/platform/tools/trebuchet/+/1697313 Change-Id: I4243e1de72d48283ac6ac224ca965760590c437c
2021-05-11Fix usage of minBy to unblock Kotlin 1.5 upgrade am: 6e914b3fe5 am: ↵Aurimas Liutikas
b8f6cdd074 am: de6c7e8d3a am: f39cee6412 Original change: https://android-review.googlesource.com/c/platform/tools/trebuchet/+/1697313 Change-Id: Ied608acc33cb8575c92fa4ab16b6de0a450dac4a
2021-05-11Fix usage of minBy to unblock Kotlin 1.5 upgrade am: 6e914b3fe5 am: ↵Aurimas Liutikas
b8f6cdd074 am: de6c7e8d3a am: f39cee6412 Original change: https://android-review.googlesource.com/c/platform/tools/trebuchet/+/1697313 Change-Id: Ib1abd8b7a8c25882965e753bc919be22ddf49d42
2021-05-11Fix usage of minBy to unblock Kotlin 1.5 upgrade am: 6e914b3fe5 am: ↵Aurimas Liutikas
b8f6cdd074 am: de6c7e8d3a Original change: https://android-review.googlesource.com/c/platform/tools/trebuchet/+/1697313 Change-Id: I84bb70b26524c4ec8ee465d5fe53cff33686278f
2021-05-11Fix usage of minBy to unblock Kotlin 1.5 upgrade am: 6e914b3fe5 am: b8f6cdd074Aurimas Liutikas
Original change: https://android-review.googlesource.com/c/platform/tools/trebuchet/+/1697313 Change-Id: Ief6e71f4e63612c46e687bb14a36ce306ed18598
2021-05-11Fix usage of minBy to unblock Kotlin 1.5 upgrade am: 6e914b3fe5Aurimas Liutikas
Original change: https://android-review.googlesource.com/c/platform/tools/trebuchet/+/1697313 Change-Id: Ic62abc795e087b684f802d410035b89e41923016
2021-05-07Fix usage of minBy to unblock Kotlin 1.5 upgradeAurimas Liutikas
Test: make traceviewer traceutils Change-Id: Id46f64aad971aa61456a73013cb5c268a3a01f32
2021-04-30Remove explicit TEST_MAPPING file for trebuchet-core am: a2ce1af715 am: ↵Julien Desprez
8fd02ed7da am: d3eafff21c am: 89917b1787 am: 57fb2179ff Original change: https://android-review.googlesource.com/c/platform/tools/trebuchet/+/1690952 Change-Id: If731dad5ef4590bb2845cb2536bdc931fcbbbc4d
2021-04-30Remove explicit TEST_MAPPING file for trebuchet-core am: a2ce1af715 am: ↵Julien Desprez
8fd02ed7da am: d3eafff21c am: 89917b1787 Original change: https://android-review.googlesource.com/c/platform/tools/trebuchet/+/1690952 Change-Id: Ie96e8eff72d2f984f20fd1437dad7ff0bd73badf
2021-04-30Remove explicit TEST_MAPPING file for trebuchet-core am: a2ce1af715 am: ↵Julien Desprez
8fd02ed7da am: d3eafff21c am: 89917b1787 Original change: https://android-review.googlesource.com/c/platform/tools/trebuchet/+/1690952 Change-Id: I8d4d3b584e096e125f18121ec5f22aff034a7c1c
2021-04-30Remove explicit TEST_MAPPING file for trebuchet-core am: a2ce1af715 am: ↵Julien Desprez
8fd02ed7da am: d3eafff21c am: 89917b1787 Original change: https://android-review.googlesource.com/c/platform/tools/trebuchet/+/1690952 Change-Id: I34601fe5e7df59d43ee6f5fec58bb2b2922a5f11
2021-04-30Remove explicit TEST_MAPPING file for trebuchet-core am: a2ce1af715 am: ↵Julien Desprez
8fd02ed7da am: d3eafff21c am: 89917b1787 Original change: https://android-review.googlesource.com/c/platform/tools/trebuchet/+/1690952 Change-Id: Iadc9fcd17e89d39f5511ed63cf7e3944e95aefb4
2021-04-30Remove explicit TEST_MAPPING file for trebuchet-core am: a2ce1af715 am: ↵Julien Desprez
8fd02ed7da am: d3eafff21c Original change: https://android-review.googlesource.com/c/platform/tools/trebuchet/+/1690952 Change-Id: Iabe961f114270ef7146af2b81be2342f66d80d7c
2021-04-30Remove explicit TEST_MAPPING file for trebuchet-core am: a2ce1af715 am: ↵Julien Desprez
8fd02ed7da Original change: https://android-review.googlesource.com/c/platform/tools/trebuchet/+/1690952 Change-Id: Ie322811e3c51046f6f426ed3c596084476a34b64
2021-04-30Remove explicit TEST_MAPPING file for trebuchet-core am: a2ce1af715Julien Desprez
Original change: https://android-review.googlesource.com/c/platform/tools/trebuchet/+/1690952 Change-Id: Ied0c8a1dff43c0e2c0bc2e7118f57457d864e88a
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 16:32:25 +0000