aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2021-03-03[automerger skipped] Merge RQ2A.210305.007 am: 955766f653 -s ours am: 784015c...temp_ab_7272582Xin Li
2021-03-03[automerger skipped] Merge RQ2A.210305.007 am: 955766f653 -s oursXin Li
2021-03-03Merge RQ2A.210305.007android-s-beta-2android-s-beta-1Xin Li
2021-03-02Merge RQ2A.210305.007 into stage. am: 7bf0c6dfd5Xin Li
2021-03-01Merge RQ2A.210305.007 into stage.temp_RQ2A.210305.007Xin Li
2021-03-01[automerger skipped] DO NOT MERGE - Mark RQ2A.210105.001 as merged. am: 680ef...Xin Li
2021-03-01DO NOT MERGE - Mark RQ2A.210105.001 as merged.Xin Li
2021-02-23[automerger skipped] Merge ab/7061308 into stage. am: c8a7d12477 -s oursXin Li
2021-02-21Merge ab/7061308 into stage.Xin Li
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/nos/host/generic am: f7878ea653 am:...Bob Badour
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/nos/host/generic am: f7878ea653Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/nos/host/genericandroid-s-preview-1Bob Badour
2021-01-14Merge cherrypicks of [13343779, 13343968, 13343886, 13343395, 13341216, 13343...android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android11-qpr2-releaseandroid-build-team Robot
2021-01-14Merge remote-tracking branch 'goog/upstream-rvc-qpr2' into MP-RVC-14mBill Richardson
2021-01-08Merge remote-tracking branch 'goog/upstream-rvc-qpr2' into MP-RVC-14m am: f8f...Bill Richardson
2021-01-07Merge remote-tracking branch 'goog/upstream-rvc-qpr2' into MP-RVC-14mBill Richardson
2021-01-07Add NuggetClientDebuggable class for testingBill Richardson
2021-01-07Limit MAC sizes for ICsetAuthTokenRequest in *.optionsBill Richardson
2020-12-10[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: 887d2cf937 -s ou...Xin Li
2020-12-10[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: 887d2cf937 -s oursXin Li
2020-12-10Snap for 7022639 from 3424c9f946b5977305f97780b7404e922b522252 to rvc-qpr2-re...android-build-team Robot
2020-12-09Merge remote-tracking branch 'nosp/rvc-qpr2' into josephjang-nos-merge-upstre...Joseph Jang
2020-12-08DO NOT MERGE - Merge Android R QPR1Xin Li
2020-12-04Merge remote-tracking branch 'nosp/rvc-qpr2' into josephjang-nos-merge-upstreamJoseph Jang
2020-12-04identity: Add one more parameter to customize attest nameJoseph Jang
2020-12-03[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: 8...Xin Li
2020-11-23Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855temp_rvc_qpr_mergeXin Li
2020-10-26Snap for 6931970 from 554d1b94b2b71895d5359aaf6475e667789c33b3 to rvc-qpr2-re...android-build-team Robot
2020-10-26Merge remote-tracking branch 'goog/upstream-master' into MP-RVC-12 am: 554d1b...Bill Richardson
2020-10-19Merge remote-tracking branch 'goog/upstream-master' into MP-RVC-12Bill Richardson
2020-10-14keymaster: Correct the scale of the timestamp in the attest certTommy Chiu
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: b5af07c0fd -s ours am: 25c...Xin Li
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: b5af07c0fd -s oursXin Li
2020-10-08Skip ab/6749736 in stage.Xin Li
2020-09-25Merge remote-tracking branch 'goog/upstream-master_branch' into rvc-qpr-dev a...Chungjui Fan
2020-09-25Merge remote-tracking branch 'goog/upstream-master_branch' into rvc-qpr-devandroid-11.0.0_r30android11-qpr1-c-releaseChungjui Fan
2020-09-25Define the upgrade stateChungjui Fan
2020-09-24Add APP_ERROR_NOT_READY to enum app_statusBill Richardson
2020-09-23To support fastboot haljosephjang
2020-09-11[automerger skipped] Merge Android R am: 57492c61c8 -s ours am: 46d76889ca -s...Xin Li
2020-09-11[automerger skipped] Merge Android R am: 57492c61c8 -s ours am: 46d76889ca -s...Xin Li
2020-09-11[automerger skipped] Merge Android R am: 57492c61c8 -s ours am: 46d76889ca -s...Xin Li
2020-09-11[automerger skipped] Merge Android R am: 57492c61c8 -s oursXin 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-14Merge remote-tracking branch 'goog/upstream-primary' into chungjuifan-nos-mer...Chungjui Fan
2020-08-14Merge remote-tracking branch 'goog/upstream-primary' into chungjuifan-nos-mer...Chungjui Fan