summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2021-12-20Merge SP1A.211205.008android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Xin Li
2021-12-03Add support for MODULES_BUILD_FROM_SOURCE for consistency with am: 41b7a097batemp_sam_210511427Mathew Inwood
2021-12-02Add support for MODULES_BUILD_FROM_SOURCE for consistency withMathew Inwood
2021-11-10Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918Xin Li
2021-10-13Merge cherrypicks of [16049893, 16049894, 16049738, 16049991, 16049805, 16050...android-12.0.0_r28android-12.0.0_r26android-12.0.0_r16android12-qpr1-releaseAndroid Build Coastguard Worker
2021-10-13DO NOT MERGE Drop prebuilt files to android source tree.Baligh Uddin
2021-10-13Add support for annotations in module_sdk am: d4812d8fa2Anton Hansson
2021-10-13Add support for annotations in module_sdkandroid-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Anton Hansson
2021-10-08[automerger skipped] Merge Android 12 am: 6cdebb10ca -s ours am: e682ff9df1 -...Xin Li
2021-10-08[automerger skipped] Merge Android 12 am: 6cdebb10ca -s ours am: e682ff9df1 -...Xin Li
2021-10-08[automerger skipped] Merge Android 12 am: 6cdebb10ca -s oursXin Li
2021-10-06Merge Android 12Xin Li
2021-09-29[automerger skipped] Merge SP1A.210812.016 am: 712d508966 -s ours am: c3083f2...Xin Li
2021-09-29[automerger skipped] Merge SP1A.210812.016 am: 712d508966 -s oursXin Li
2021-09-28Merge SP1A.210812.016temp_sam_202323961Xin Li
2021-09-28DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged am: ...Xin Li
2021-09-28DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged am: ...Xin Li
2021-09-28DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already mergedXin Li
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 3de62f...Xin Li
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 3de62f...Xin Li
2021-08-17Merge cherrypicks of [15589380, 15589521, 15589522, 15589273, 15589503, 15589...android-vts-12.0_r9android-vts-12.0_r8android-vts-12.0_r7android-vts-12.0_r6android-vts-12.0_r5android-vts-12.0_r4android-vts-12.0_r3android-vts-12.0_r2android-vts-12.0_r12android-vts-12.0_r11android-vts-12.0_r10android-vts-12.0_r1android-security-12.0.0_r61android-security-12.0.0_r60android-security-12.0.0_r59android-security-12.0.0_r58android-security-12.0.0_r57android-security-12.0.0_r56android-security-12.0.0_r55android-security-12.0.0_r54android-security-12.0.0_r53android-security-12.0.0_r52android-security-12.0.0_r51android-security-12.0.0_r50android-security-12.0.0_r49android-security-12.0.0_r48android-security-12.0.0_r47android-security-12.0.0_r46android-security-12.0.0_r45android-security-12.0.0_r44android-security-12.0.0_r43android-security-12.0.0_r42android-security-12.0.0_r41android-security-12.0.0_r40android-security-12.0.0_r39android-security-12.0.0_r38android-security-12.0.0_r37android-security-12.0.0_r36android-security-12.0.0_r35android-security-12.0.0_r34android-security-11.0.0_r71android-platform-12.0.0_r1android-cts-12.0_r9android-cts-12.0_r8android-cts-12.0_r7android-cts-12.0_r6android-cts-12.0_r5android-cts-12.0_r4android-cts-12.0_r3android-cts-12.0_r2android-cts-12.0_r12android-cts-12.0_r11android-cts-12.0_r10android-cts-12.0_r1android-12.0.0_r9android-12.0.0_r8android-12.0.0_r34android-12.0.0_r33android-12.0.0_r31android-12.0.0_r30android-12.0.0_r3android-12.0.0_r25android-12.0.0_r2android-12.0.0_r11android-12.0.0_r10android-12.0.0_r1android12-tests-releaseandroid12-security-releaseandroid12-s5-releaseandroid12-s4-releaseandroid12-s3-releaseandroid12-s2-releaseandroid12-s1-releaseandroid12-releaseAndroid Build Coastguard Worker
2021-08-17DO NOT MERGE Drop prebuilt files to android source tree.Adam Seaton
2021-08-17Snap for 7647375 from f3c8a69e5ee30b0becffdcd4f7f4ac26d062e1e3 to sc-qpr1-rel...Android Build Coastguard Worker
2021-08-16[automerger skipped] Re-enable prebuilt SDK am: 7c5081f6d6 -s ours am: 90be1a...Anton Hansson
2021-08-16[automerger skipped] Re-enable prebuilt SDK am: 7c5081f6d6 -s ours am: f3c8a6...Anton Hansson
2021-08-16[automerger skipped] Re-enable prebuilt SDK am: b0c5963fbe -s oursAnton Hansson
2021-08-16[automerger skipped] Re-enable prebuilt SDK am: 7c5081f6d6 -s oursAnton Hansson
2021-08-16[automerger skipped] Re-enable prebuilt SDK am: 7c5081f6d6 -s oursAnton Hansson
2021-08-15Re-enable prebuilt SDKAnton Hansson
2021-08-15Re-enable prebuilt SDKAnton Hansson
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622Xin Li
2021-08-14Snap for 7641961 from c87b1a2dd215e7cd9c1563915278467ac7ceb3ed to sc-qpr1-rel...Android Build Coastguard Worker
2021-08-13DO NOT MERGE Drop prebuilt files to android source tree. am: c4e4f765d3 am: c...Adam Seaton
2021-08-13DO NOT MERGE Drop prebuilt files to android source tree. am: c4e4f765d3 am: d...Adam Seaton
2021-08-13DO NOT MERGE Drop prebuilt files to android source tree. am: c4e4f765d3Adam Seaton
2021-08-13DO NOT MERGE Drop prebuilt files to android source tree. am: c4e4f765d3Adam Seaton
2021-08-13DO NOT MERGE Drop prebuilt files to android source tree.Adam Seaton
2021-08-13Snap for 7637474 from 4fee4a4b94d693255320aa479facad18fa88dea8 to sc-qpr1-rel...Android Build Coastguard Worker
2021-08-12[automerger skipped] Disable the prebuilt SDK for MediaProvider am: 4fee4a4b9...Ray Essick
2021-08-12Disable the prebuilt SDK for MediaProviderRay Essick
2021-08-12[automerger skipped] Disable the prebuilt SDK for MediaProvider am: e661590c2...Ray Essick
2021-08-12[automerger skipped] Disable the prebuilt SDK for MediaProvider am: e661590c2...Ray Essick
2021-08-12[automerger skipped] Disable the prebuilt SDK for MediaProvider am: e661590c2...Ray Essick
2021-08-12[automerger skipped] Disable the prebuilt SDK for MediaProvider am: e661590c2...Ray Essick
2021-08-12Disable the prebuilt SDK for MediaProviderRay Essick
2021-08-06Snap for 7616100 from d7ccbd332a73eea2d932b80cf418f68705e6a4a8 to sc-releaseAndroid Build Coastguard Worker
2021-08-05DO NOT MERGE Drop prebuilt files to android source tree. am: d7ccbd332aandroid-modules-prebuiltdrop
2021-08-05DO NOT MERGE Drop prebuilt files to android source tree.android12-devandroid-modules-prebuiltdrop
2021-08-04Snap for 7608384 from d863dd06321a753ac0f682260add567dc7f280a3 to sc-releaseAndroid Build Coastguard Worker
2021-08-03DO NOT MERGE Drop prebuilt files to android source tree. am: d863dd0632android-modules-prebuiltdrop