aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2021-04-30Merge "Convert src/main/Android.mk to Android.bp" am: 3c3a5d95b6android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Yuntao Xu
2021-04-30Merge "Convert src/main/Android.mk to Android.bp"android-s-beta-2android-s-beta-1Yuntao Xu
2021-04-28Convert src/main/Android.mk to Android.bpYuntao Xu
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to developers/samples/android" am: 7d239...Treehugger Robot
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to developers/samples/android"Treehugger Robot
2021-04-20[LSC] Add LOCAL_LICENSE_KINDS to developers/samples/androidBob Badour
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
2020-11-24Mark ab/6881855 as merged am: bae055f6ffXin Li
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 63bd46a79d -s ours am: f4b...Xin Li
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 63bd46a79d -s oursXin Li
2020-10-08Skip ab/6749736 in stage.Xin Li
2020-09-11[automerger skipped] Merge "Merge Android R" am: ddb9444be0 -s ours am: 46d25...Xin Li
2020-09-11[automerger skipped] Merge "Merge Android R" am: ddb9444be0 -s ours am: 46d25...Xin Li
2020-09-11[automerger skipped] Merge "Merge Android R" am: ddb9444be0 -s ours am: 46d25...Xin Li
2020-09-11[automerger skipped] Merge "Merge Android R" am: ddb9444be0 -s oursXin Li
2020-09-10Merge "Merge Android R"Xin Li
2020-09-08Merge Android RXin Li
2020-09-01[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@669270...Xin Li
2020-09-01[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@669270...Xin Li
2020-09-01[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@669270...Xin Li
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
2020-08-19Merge "Update language to comply with Android's inclusive language guidance" ...Joanne Chung
2020-08-19Merge "Update language to comply with Android's inclusive language guidance" ...Joanne Chung
2020-08-19Merge "Update language to comply with Android's inclusive language guidance" ...Joanne Chung
2020-08-19Merge "Update language to comply with Android's inclusive language guidance" ...Joanne Chung
2020-08-19Merge "Update language to comply with Android's inclusive language guidance"Joanne Chung
2020-08-17Update language to comply with Android's inclusive language guidanceJoanne Chung
2020-08-17Merge "Update language to comply with Android's inclusive language guidance" ...Joanne Chung
2020-08-17Merge "Update language to comply with Android's inclusive language guidance" ...Joanne Chung
2020-08-17Merge "Update language to comply with Android's inclusive language guidance" ...Joanne Chung
2020-08-17Merge "Update language to comply with Android's inclusive language guidance" ...Joanne Chung
2020-08-17Merge "Update language to comply with Android's inclusive language guidance"Joanne Chung
2020-08-14Update language to comply with Android's inclusive language guidanceJoanne Chung
2020-07-31Merge "Update language to comply with Android's inclusive language guidance" ...Treehugger Robot
2020-07-31Merge "Update language to comply with Android's inclusive language guidance" ...Treehugger Robot
2020-07-31Merge "Update language to comply with Android's inclusive language guidance" ...Treehugger Robot
2020-07-31Merge "Update language to comply with Android's inclusive language guidance" ...Treehugger Robot
2020-07-31Merge "Update language to comply with Android's inclusive language guidance"Treehugger Robot
2020-07-30Update language to comply with Android's inclusive language guidanceJeff Sharkey
2020-07-27Merge "Update language to comply with Android’s inclusive language guidance...Xevi Miro Bruix
2020-07-27Merge "Update language to comply with Android’s inclusive language guidance...Xevi Miro Bruix
2020-07-27Merge "Update language to comply with Android’s inclusive language guidance...Xevi Miro Bruix
2020-07-27Merge "Update language to comply with Android’s inclusive language guidance...Xevi Miro Bruix
2020-07-27Merge "Update language to comply with Android’s inclusive language guidance"Xevi Miro Bruix
2020-07-23Update language to comply with Android’s inclusive language guidanceXevi Miro Bruix
2019-10-30[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915...r_aml_301500702android-mainline-12.0.0_r55android-mainline-12.0.0_r112android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseandroid11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseaml_tz2_305400100Xin Li
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...android-r-preview-4android-r-preview-3android-r-preview-2android-r-beta-3android-r-beta-2Xin Li
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...android-r-preview-1Xin Li
2019-10-26[automerger skipped] Merge Coral/Flame into AOSP master am: aa864d3320 -s our...Xin Li
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 19:34:23 +0000