summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2024-03-07Merge "Merge Android 14 QPR2 to AOSP main" into mainHEADmastermainXin Li
2024-03-06Merge Android 14 QPR2 to AOSP mainXin Li
2024-02-19Merge "Migrate Test Targets to New Android Ownership Model" into main am: 12c...temp_319669529Treehugger Robot
2024-02-19Merge "Migrate Test Targets to New Android Ownership Model" into mainTreehugger Robot
2024-02-02Migrate Test Targets to New Android Ownership ModelAditya Choudhary
2024-01-17Merge Android 24Q1 Release (ab/11220357)Xin Li
2023-12-13[automerger skipped] Merge "Uptesting is moving folks to /external/robolectri...Kevin Liu
2023-12-13Merge "Uptesting is moving folks to /external/robolectric from /external/robo...Kevin Liu
2023-12-13Merge "Uptesting is moving folks to /external/robolectric from /external/robo...Kevin Liu
2023-12-13Merge "Uptesting is moving folks to /external/robolectric from /external/robo...Kevin Liu
2023-12-13Uptesting is moving folks to /external/robolectric from /external/robolectric...Kevin Liu
2023-12-11[automerger skipped] Merge "Merge Android 14 QPR1" into main am: ab30aeac7a -...Xin Li
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 30525932e4 -s ours am: c51b11c...Xin Li
2023-12-11[automerger skipped] Merge "Merge Android 14 QPR1" into main am: ab30aeac7a -...Xin Li
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 30525932e4 -s ours am: c51b11c...Xin Li
2023-12-11[automerger skipped] Merge "Merge Android 14 QPR1" into main am: ab30aeac7a -...Xin Li
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 30525932e4 -s oursXin Li
2023-12-09Merge "Merge Android 14 QPR1" into mainXin Li
2023-12-08Merge Android 14 QPR1Xin Li
2023-12-06Uptesting is moving folks to /external/robolectric from /external/robolectric...Kevin Liu
2023-11-06[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f29684ce5...Bill Yi
2023-11-06[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f29684ce5...Bill Yi
2023-11-03Import translations. DO NOT MERGE ANYWHEREBill Yi
2023-11-03Import translations. DO NOT MERGE ANYWHEREBill Yi
2023-10-19[automerger skipped] Merge 10952656 am: 4df1a75313 -s ours am: 3fa822c7fc -s ...Xin Li
2023-10-19[automerger skipped] Merge 10952656 am: 4df1a75313 -s oursXin Li
2023-10-17Merge 10952656tmp_amf_315507370Xin Li
2023-10-07[automerger skipped] Merge "Merge Android 14" into main am: 2de66c28b2 -s our...Xin Li
2023-10-07[automerger skipped] Merge Android 14 am: afc29ed91c -s ours am: 94d38b9434 -...Xin Li
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: 2de66c28b2 -s our...Xin Li
2023-10-06[automerger skipped] Merge Android 14 am: afc29ed91c -s ours am: 94d38b9434 -...Xin Li
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: 2de66c28b2 -s our...Xin Li
2023-10-06[automerger skipped] Merge Android 14 am: afc29ed91c -s ours am: 94d38b9434 -...Xin Li
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: 2de66c28b2 -s our...Xin Li
2023-10-06[automerger skipped] Merge Android 14 am: afc29ed91c -s ours am: 94d38b9434 -...Xin Li
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: 2de66c28b2 -s oursXin Li
2023-10-06[automerger skipped] Merge Android 14 am: afc29ed91c -s oursXin Li
2023-10-06Merge "Merge Android 14" into mainXin Li
2023-10-05Merge Android 14Xin Li
2023-08-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ce51ab089...Bill Yi
2023-08-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ce51ab089...Bill Yi
2023-08-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ce51ab089...Bill Yi
2023-08-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ce51ab089...Bill Yi
2023-08-31Import translations. DO NOT MERGE ANYWHEREtmp_amf_298295554Bill Yi
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 6805c8c82b -s ours am:...Xin Li
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 6805c8c82b -s ours am:...Xin Li
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 6805c8c82b -s ours am:...Xin Li
2023-08-28[automerger skipped] Merge Android U (ab/10368041) am: 6805c8c82b -s oursXin Li
2023-08-14Merge Android U (ab/10368041)Xin Li
2023-06-21[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 08eebec38...Bill Yi