aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2021-10-07Merge "Merge Android 12"android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
2021-10-06Merge Android 12Xin Li
2021-09-14Add android:exported tagtemp_sam_202323961Colin Cross
2021-04-30Merge "Convert src/main/Android.mk to Android.bp" am: 3c3a5d95b6 am: 8184c3c8...Yuntao Xu
2021-04-30Merge "Convert src/main/Android.mk to Android.bp" am: 3c3a5d95b6 am: 8184c3c8...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-releaseandroid12-devYuntao Xu
2021-04-30Merge "Convert src/main/Android.mk to Android.bp" am: 3c3a5d95b6 am: 8184c3c810Yuntao Xu
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" am: 7d239...Treehugger Robot
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-20[automerger skipped] Mark ab/7061308 as merged in stage. am: ad509e0e1d -s ou...Xin Li
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: ad509e0e1d -s oursXin Li
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
2020-11-24Mark ab/6881855 as merged am: bae055f6ff am: e581b694acXin 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 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 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-02[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-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-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-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