summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2021-04-08Merge "Fix build error due to null annotations in core platform API" am: ddbc...android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-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-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-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-devPaul Duffin
2021-04-08Merge "Fix build error due to null annotations in core platform API" am: ddbc...temp_ab_7272582Paul Duffin
2021-04-08Merge "Fix build error due to null annotations in core platform API" am: ddbc...Paul Duffin
2021-04-08Merge "Fix build error due to null annotations in core platform API"android-s-beta-2android-s-beta-1Paul Duffin
2021-04-08Fix build error due to null annotations in core platform APIPaul Duffin
2021-02-24Merge "Attempt to fix dx-tests to run in CI as a unit tests" am: 27d7b79d6d a...Julien Desprez
2021-02-24Merge "Attempt to fix dx-tests to run in CI as a unit tests" am: 27d7b79d6d a...Julien Desprez
2021-02-24Merge "Attempt to fix dx-tests to run in CI as a unit tests" am: 27d7b79d6dJulien Desprez
2021-02-24Merge "Attempt to fix dx-tests to run in CI as a unit tests"Julien Desprez
2021-02-23Attempt to fix dx-tests to run in CI as a unit testsJulien Desprez
2021-02-22Merge "[LSC] Add LOCAL_LICENSE_KINDS to dalvik" am: 120c5bf00b am: 45bba9ec66...Treehugger Robot
2021-02-22Merge "[LSC] Add LOCAL_LICENSE_KINDS to dalvik" am: 120c5bf00b am: 45bba9ec66Treehugger Robot
2021-02-22Merge "[LSC] Add LOCAL_LICENSE_KINDS to dalvik" am: 120c5bf00bTreehugger Robot
2021-02-22Merge "[LSC] Add LOCAL_LICENSE_KINDS to dalvik"Treehugger Robot
2021-02-21[LSC] Add LOCAL_LICENSE_KINDS to dalvikBob Badour
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: cf5879a19d -s ou...Xin Li
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: cf5879a19d -s oursXin Li
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
2021-01-20[automerger skipped] Update bat files to not use find_java.bat am: da7b74d9cc...Joe Baker-Malone
2021-01-20[automerger skipped] Update bat files to not use find_java.bat am: da7b74d9cc...Joe Baker-Malone
2021-01-20[automerger skipped] Update bat files to not use find_java.bat am: da7b74d9cc...Joe Baker-Malone
2021-01-20Update bat files to not use find_java.bat am: da7b74d9ccJoe Baker-Malone
2021-01-20Update bat files to not use find_java.bat am: da7b74d9ccJoe Baker-Malone
2021-01-19Update bat files to not use find_java.batJoe Baker-Malone
2020-11-24Mark ab/6881855 as merged am: 35e485b68a am: fe82a47e60Xin Li
2020-11-24Mark ab/6881855 as merged am: 35e485b68aXin Li
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 566e171bb4 -s ours am: d91...Xin Li
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 566e171bb4 -s ours am: d91...Xin Li
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 566e171bb4 -s oursXin Li
2020-10-08Skip ab/6749736 in stage.Xin Li
2020-08-27[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709...Xin Li
2020-08-27[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709...Xin Li
2020-08-27[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709...Xin Li
2020-08-27[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709...Xin Li
2020-08-27Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li
2020-08-03Merge "Remove `create_stubs: false` from droiddoc" am: f9ab924fb7 am: 8ea87f3...Treehugger Robot
2020-08-03Merge "Remove `create_stubs: false` from droiddoc" am: f9ab924fb7 am: 8ea87f3...Treehugger Robot
2020-08-03Merge "Remove `create_stubs: false` from droiddoc" am: f9ab924fb7 am: 8ea87f3...Treehugger Robot
2020-08-03Merge "Remove `create_stubs: false` from droiddoc" am: f9ab924fb7 am: 8ea87f3397Treehugger Robot
2020-08-03Merge "Remove `create_stubs: false` from droiddoc" am: f9ab924fb7Treehugger Robot
2020-08-03Merge "Remove `create_stubs: false` from droiddoc"Treehugger Robot
2020-07-31Remove `create_stubs: false` from droiddocLiz Kammer
2020-07-31Merge "Update OWNERS list" am: e7d81cd936 am: 07f5bff5be am: fd7bc1b682 am: b...Orion Hodson
2020-07-31Merge "Update OWNERS list" am: e7d81cd936 am: 07f5bff5be am: fd7bc1b682 am: b...Orion Hodson
2020-07-30Merge "Update OWNERS list" am: e7d81cd936 am: 07f5bff5be am: fd7bc1b682Orion Hodson
2020-07-30Merge "Update OWNERS list" am: e7d81cd936 am: 07f5bff5beOrion Hodson
2020-07-30Merge "Update OWNERS list" am: e7d81cd936Orion Hodson
2020-07-30Merge "Update OWNERS list"Orion Hodson
2020-07-29Merge "Inclusive language updates" am: c634c04b70 am: 92442f41e9 am: 93218ed0...Treehugger Robot