summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-12-21Snap for 6091388 from eec32327da28db6f5e599a4ab76f7c93995896ef to qt-d4-releaseandroid-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android10-d4-s1-releaseandroid10-d4-releaseandroid-build-team Robot
Change-Id: Id1e34e3dc930021b67b91a82a4b2da8523150273
2019-12-20Merge "Revert submission 9919844-manual r1 merge" into qt-r1-dev am: b7c7866043android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android10-qpr3-s1-releaseandroid10-qpr3-releaseAutomerger Merge Worker
Change-Id: I9f0ecbae1aba43e1077d017d9fb364bb874e0fa3
2019-12-20Merge "Revert submission 9940985-qpr1-dev merge" into qt-qpr1-devKimberly Kreider
2019-12-20Revert submission 9940985-qpr1-dev mergeKimberly Kreider
Reason for revert: broke tests b/146476630 Bug: 146476630 Reverted Changes: Ib3436a42b2ca8c9614939a30fb548ab39bc23e57 Change-Id: Ic936e0f03b001fff37308bb576376299c5ebef20 Exclude merging into branches that contain last aosp change included in merge. Merged-In: 483ea33b74d7008d909e817c754ba9165ae704b1
2019-12-20Merge "Revert submission 9919844-manual r1 merge" into qt-r1-devTreeHugger Robot
2019-12-20Snap for 6088402 from 6b5d88ae4cecf048f2d2bd7c48777d5b07cb7823 to qt-d4-releaseandroid-build-team Robot
Change-Id: I8fb7ee77cf66789977facd02b9933186eb72fb41
2019-12-20Revert submission 9919844-manual r1 mergeKimberly Kreider
Reason for revert: broke tests b/146476630 Bug: 146476630 Reverted Changes: Change-Id: I1f359c8b6475a34fadf109c9940ce7640d45360a
2019-12-19DO NOT MERGE: Adding required loganalysis changes for tradefed merge into ↵Automerger Merge Worker
qt-dev. am: c7bcaba872 am: 4035b6cc11 Change-Id: I88d0e26ecf3ae3d250c253ab05dfaa3a3f06601a
2019-12-19DO NOT MERGE: Adding required loganalysis changes for tradefed merge into ↵Automerger Merge Worker
qt-dev. am: 34f2aeed26 Change-Id: I7d088871ebecfb78fbdce504a5211f4500e7c673
2019-12-17DO NOT MERGE: Adding required loganalysis changes for tradefed merge into ↵Kimberly Kreider
qt-dev. Bug: 143908003 Change-Id: Ib3436a42b2ca8c9614939a30fb548ab39bc23e57 Exclude merging into *-plus-aosp branches, since they already include the change. Merged-In: I2ae86ba9706747873268192988c32879005ed0f7 Merged-In: I38efc115f2c691754d481fdffb6630607ef970e8 (cherry picked from commit c7bcaba872c7d82286960c750edd67e56ee73712)
2019-12-17DO NOT MERGE: Adding required loganalysis changes for tradefed merge into ↵Automerger Merge Worker
qt-dev. am: c7bcaba872 Change-Id: Ib3a465264063e1cdd2751b47941f39e304ac1c87
2019-12-13DO NOT MERGE: Adding required loganalysis changes for tradefed merge into ↵Kimberly Kreider
qt-dev. Bug: 143908003 Change-Id: Ib3436a42b2ca8c9614939a30fb548ab39bc23e57 Exclude merging into *-plus-aosp branches, since they already include the change. Merged-In: I2ae86ba9706747873268192988c32879005ed0f7 Merged-In: I38efc115f2c691754d481fdffb6630607ef970e8 (cherry picked from commit c7bcaba872c7d82286960c750edd67e56ee73712)
2019-11-20DO NOT MERGE: Adding required loganalysis changes for tradefed merge into ↵Kimberly Kreider
qt-dev. Bug: 143908003 Change-Id: Ib3436a42b2ca8c9614939a30fb548ab39bc23e57 Exclude merging into *-plus-aosp branches, since they already include the change. Merged-In: I2ae86ba9706747873268192988c32879005ed0f7 Merged-In: I38efc115f2c691754d481fdffb6630607ef970e8
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospandroid-vts-10.0_r9android-vts-10.0_r8android-vts-10.0_r7android-vts-10.0_r6android-vts-10.0_r5android-vts-10.0_r4android-vts-10.0_r3android-vts-10.0_r2android-vts-10.0_r16android-vts-10.0_r15android-vts-10.0_r14android-vts-10.0_r13android-vts-10.0_r12android-vts-10.0_r11android-vts-10.0_r10android-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-cts-10.0_r9android-cts-10.0_r8android-cts-10.0_r7android-cts-10.0_r6android-cts-10.0_r5android-cts-10.0_r4android-cts-10.0_r3android-cts-10.0_r2android-cts-10.0_r16android-cts-10.0_r15android-cts-10.0_r14android-cts-10.0_r13android-cts-10.0_r12android-cts-10.0_r11android-cts-10.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-tests-releaseandroid10-tests-devandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-devandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li
am: 71fc5ec717 Change-Id: Ic6cb00d77a4565432d66d185a4e3491de1b34468
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: I0ececcb5e7a80b183877dcfa52fbafb7dc7a97fc
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-o-mr1-iot-release-1.0.13Xin Li
Bug: 120848293 Change-Id: I6afea6fdbd5b0436a03fcc839e560498f5a8c131
2019-02-19Merge "Parse "Wait for property" duration from dmesg." am: 5775f059d0 am: ↵Gopinath Elanchezhian
6483d06252 am: 81fb4f23b3 Change-Id: I38735db2d15a520d0f989ec3f15787ba6e4d2f16
2019-02-19Merge "Parse "Wait for property" duration from dmesg." am: 5775f059d0Gopinath Elanchezhian
am: 6483d06252 Change-Id: I54e711820a3f8c37d553e68252b033b838833116
2019-02-19Merge "Parse "Wait for property" duration from dmesg."Gopinath Elanchezhian
am: 5775f059d0 Change-Id: I05ff969abf020a28c60d3f06ea3e47a4cc7d1432
2019-02-20Merge "Parse "Wait for property" duration from dmesg."android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseGopinath Elanchezhian
2019-02-19Parse "Wait for property" duration from dmesg.gopinath
Bug: b/123788098 Test: DmesgParserTest Change-Id: I12fd7fc8095de72bc011c07a187564d1cae549ec
2019-01-14Merge "Fix guava classpath" am: 149fa628e5 am: e26a878cd8Julien Desprez
am: 22c4bdb982 Change-Id: I1558cdc718dda187988204d92791c58f8945c1a4
2019-01-14Merge "Fix guava classpath" am: 149fa628e5Julien Desprez
am: e26a878cd8 Change-Id: I950f20693bf866b96cae284defc5692f6d19f8c8
2019-01-14Merge "Fix guava classpath"Julien Desprez
am: 149fa628e5 Change-Id: I827699e1aaaa64a35dfd3083e15a7ceef28a9149
2019-01-14Merge "Fix guava classpath"Julien Desprez
2019-01-13Fix guava classpathJulien Desprez
Test: None Bug: None Change-Id: I9e868973bd00972645806e1742a6f309ac31c909
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 4110660dc0 -s ours am: 5233e8535f -s ours am: 11832a93f6 -s ours Change-Id: I3d2de081e3cc9dd5bdcc36f4facad948c6ad5473
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 4110660dc0 -s ours am: 5233e8535f -s ours Change-Id: Idda28f46fff48ce84cca29b4a82bed3996ca480a
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: 4110660dc0 -s ours Change-Id: I029262474fdab29016eaf0dc009047cc5c899693
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-n-iot-release-ihome-igv1nougat-iot-releaseBill Yi
Change-Id: I8a52b55e2777df5592a3286e14651d2c45333136
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 14543d5be2 -s ours am: d7a4fc3e99 -s ours Change-Id: I30295ef77bb8264803709537c801a56c45b95ffb
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 14543d5be2 -s ours Change-Id: I73c02aee89317677b819bfbaf389f27c5f0c9f68
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: I1099a0634cb143d85c41af607333918436ed9b9e
2018-08-28Merge "Consolidate loganalysis and tradefed build rules" am: a30353f9c8 am: ↵Julien Desprez
b8e659ce2f am: 9beff5c271 Change-Id: I833fc1b5f50178792508121a922c6c0a9916efc0
2018-08-28Merge "Consolidate loganalysis and tradefed build rules" am: a30353f9c8Julien Desprez
am: b8e659ce2f Change-Id: I5a73e71f8c473a5e0ed2bf9abe820046e319a9af
2018-08-28Merge "Consolidate loganalysis and tradefed build rules"Julien Desprez
am: a30353f9c8 Change-Id: Ic5386840b19abedc1640517c8ad4afe45ab362c3
2018-08-28Merge "Consolidate loganalysis and tradefed build rules"android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseTreehugger Robot
2018-08-28Consolidate loganalysis and tradefed build rulesJulien Desprez
Save about 4MB of jar size by avoiding statically shipping some library several times. Test: make, unit tests Bug: 77915666 Change-Id: Iec5b24d4f2d85159bf250eded431c8e89f40f7c1
2018-08-08Merge "Merge Android Pie into master" am: c5161757ba am: d13924868a am: ↵Xin Li
ea57cd7610 am: ebf6e834d8 Change-Id: I2925cfb0922efadcf307e8817e55dfa49e93d385
2018-08-07Merge "Merge Android Pie into master" am: c5161757ba am: d13924868aXin Li
am: ea57cd7610 Change-Id: I316c3afc21aec0a2970c871945f5f5e880cb5ced
2018-08-07Merge "Merge Android Pie into master" am: c5161757baXin Li
am: d13924868a Change-Id: I751a8c397a83fa007e84ce5e769d0e306447bb94
2018-08-07Merge "Merge Android Pie into master"Xin Li
am: c5161757ba Change-Id: I106d2d27aaf8232965fe1d70f06b2b36f8e05d15
2018-08-07Merge "Merge Android Pie into master"android-o-mr1-iot-release-1.0.3Xin Li
2018-08-06Merge Android Pie into masterXin Li
Bug: 112104996 Change-Id: Id82194899e15a9abff09c21ef75dc3ac8a1f91c2
2018-06-09Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: ea5bf19ee7Xin Li
am: e34fa625c5 Change-Id: I1cab328bdb059398334016b9adde6cd6199faf89
2018-06-09Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li
am: ea5bf19ee7 Change-Id: I1b1defd3358e742c1bf7430e259e767ddc668d1a
2018-06-08Merge pi-dev-plus-aosp-without-vendor into stage-aosp-mastertemp_p_mergeXin Li
Bug: 79597307 Change-Id: I3dbae1a7e07d8bf2eff3f50b2c02fe6f747678cb
2018-05-16Merge "Loganalysis: convert to soong (1/2)" am: 7c4aeb12ee am: f7187e0d2eAndreas Gampe
am: 527b936e37 Change-Id: I7c94e21a3d376d42ef83377b62001eff087b2dd6
2018-05-16Merge "Loganalysis: convert to soong (1/2)" am: 7c4aeb12eeAndreas Gampe
am: f7187e0d2e Change-Id: I9487f7d6d9d85416ce8315734df461c4cfff3025
2018-05-16Merge "Loganalysis: convert to soong (1/2)"Andreas Gampe
am: 7c4aeb12ee Change-Id: Ia2af0b95d0cb230c7dd6f80f22d2351f6646351a
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 12:42:34 +0000