aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2024-03-25Merge "Use public API to create custom BIO in tls-boringssl.c" into mainHEADmastermainTreehugger Robot
2024-02-10Use public API to create custom BIO in tls-boringssl.cDavid Benjamin
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 05af8e87d5 -s ours am: f024d9a...Xin Li
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 05af8e87d5 -s ours am: f024d9a...Xin Li
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 05af8e87d5 -s oursXin Li
2023-12-08Merge Android 14 QPR1android-u-qpr3-beta-1-gplandroid-u-qpr2-beta-2-gplXin Li
2023-10-19[automerger skipped] Merge 10952656 am: b0c91586d6 -s ours am: 43fc740af2 -s ...Xin Li
2023-10-19[automerger skipped] Merge 10952656 am: b0c91586d6 -s oursXin Li
2023-10-17Merge 10952656tmp_amf_315507370Xin Li
2023-10-04Merge remote-tracking branch 'aosp/upstream-master' into mymerge am: a293ceee...Ashish Kumar Gupta
2023-10-04Merge remote-tracking branch 'aosp/upstream-master' into mymerge am: a293ceee...Ashish Kumar Gupta
2023-10-04Merge remote-tracking branch 'aosp/upstream-master' into mymerge am: a293ceee...Ashish Kumar Gupta
2023-10-04Merge remote-tracking branch 'aosp/upstream-master' into mymerge am: a293ceee...Ashish Kumar Gupta
2023-10-04Merge remote-tracking branch 'aosp/upstream-master' into mymerge am: a293ceeeadandroid-u-rb-dp-10-gplandroid-u-rb-dp-10-gplAshish Kumar Gupta
2023-10-04Merge remote-tracking branch 'aosp/upstream-master' into mymergeAshish Kumar Gupta
2023-08-04[automerger skipped] Upgrade libcups to v2.3.3 am: 5dc9169996 am: dc7c0ae917 ...Haibo Huang
2023-08-04Merge changes from topic "am-0b71ac6aecad4c37992a3db3c14f719a" into udc-qpr-d...Automerger Merge Worker
2023-08-04Merge "[automerger skipped] Upgrade libcups to v2.3.3 am: 5dc9169996 am: dc7c...Automerger Merge Worker
2023-08-04[automerger skipped] Upgrade libcups to v2.3.3 am: 5dc9169996 am: dc7c0ae917 ...Haibo Huang
2023-08-04[automerger skipped] Upgrade libcups to v2.3.1 am: c56dfec131 am: 9acc7f09e5 ...Haibo Huang
2023-08-04[automerger skipped] Upgrade libcups to v2.3.1 am: c56dfec131 am: 9acc7f09e5 ...Haibo Huang
2023-08-04[automerger skipped] Upgrade libcups to v2.3.3 am: 5dc9169996 am: dc7c0ae917 ...Haibo Huang
2023-08-04[automerger skipped] Upgrade libcups to v2.3.1 am: c56dfec131 am: 9acc7f09e5 ...Haibo Huang
2023-08-04[automerger skipped] Upgrade libcups to v2.3.1 am: c56dfec131 am: 9acc7f09e5 ...Haibo Huang
2023-08-04Merge "[automerger skipped] Upgrade libcups to v2.3.3 am: 5dc9169996 am: dc7c...Automerger Merge Worker
2023-08-04[automerger skipped] Upgrade libcups to v2.3.3 am: 5dc9169996 am: dc7c0ae917 ...Haibo Huang
2023-08-04[automerger skipped] Upgrade libcups to v2.3.3 am: 5dc9169996 am: dc7c0ae917 ...Haibo Huang
2023-08-04Merge "[automerger skipped] Upgrade libcups to v2.3.1 am: c56dfec131 am: 9acc...Automerger Merge Worker
2023-08-04[automerger skipped] Upgrade libcups to v2.3.1 am: c56dfec131 am: 9acc7f09e5 ...Haibo Huang
2023-08-04[automerger skipped] Upgrade libcups to v2.3.1 am: c56dfec131 am: 9acc7f09e5 ...Haibo Huang
2023-08-04[automerger skipped] Upgrade libcups to v2.3.3 am: 5dc9169996 am: dc7c0ae917 ...Haibo Huang
2023-08-04Merge changes from topic "am-0b71ac6aecad4c37992a3db3c14f719a" into udc-qpr-d...Automerger Merge Worker
2023-08-04Merge "[automerger skipped] Upgrade libcups to v2.3.3 am: 5dc9169996 am: dc7c...Automerger Merge Worker
2023-08-04[automerger skipped] Upgrade libcups to v2.3.3 am: 5dc9169996 am: dc7c0ae917 ...Haibo Huang
2023-08-04[automerger skipped] Upgrade libcups to v2.3.3 am: 5dc9169996 am: dc7c0ae917 ...Haibo Huang
2023-08-04[automerger skipped] Upgrade libcups to v2.3.1 am: c56dfec131 am: 9acc7f09e5 ...Haibo Huang
2023-08-04[automerger skipped] Upgrade libcups to v2.3.1 am: c56dfec131 am: 9acc7f09e5 ...Haibo Huang
2023-08-04[automerger skipped] Upgrade libcups to v2.3.3 am: 5dc9169996 am: dc7c0ae917 ...Haibo Huang
2023-08-04[automerger skipped] Upgrade libcups to v2.3.1 am: c56dfec131 am: 9acc7f09e5 ...Haibo Huang
2023-08-04[automerger skipped] Upgrade libcups to v2.3.1 am: c56dfec131 am: 9acc7f09e5 ...Haibo Huang
2023-08-04Merge "[automerger skipped] Upgrade libcups to v2.3.3 am: 5dc9169996 am: dc7c...Automerger Merge Worker
2023-08-04[automerger skipped] Upgrade libcups to v2.3.3 am: 5dc9169996 am: dc7c0ae917 ...Haibo Huang
2023-08-04[automerger skipped] Upgrade libcups to v2.3.3 am: 5dc9169996 am: dc7c0ae917 ...Haibo Huang
2023-08-04Merge "[automerger skipped] Upgrade libcups to v2.3.1 am: c56dfec131 am: 9acc...Automerger Merge Worker
2023-08-04[automerger skipped] Upgrade libcups to v2.3.1 am: c56dfec131 am: 9acc7f09e5 ...Haibo Huang
2023-08-04[automerger skipped] Upgrade libcups to v2.3.1 am: c56dfec131 am: 9acc7f09e5 ...Haibo Huang
2023-08-04[automerger skipped] Upgrade libcups to v2.3.3 am: 5dc9169996 am: dc7c0ae917 ...Haibo Huang
2023-08-04[automerger skipped] Upgrade libcups to v2.3.3 am: 5dc9169996 am: dc7c0ae917 ...Haibo Huang
2023-08-04[automerger skipped] Upgrade libcups to v2.3.1 am: c56dfec131 am: 9acc7f09e5 ...Haibo Huang
2023-08-04Merge "[automerger skipped] Upgrade libcups to v2.3.3 am: 5dc9169996 am: dc7c...Automerger Merge Worker