aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2022-01-12Merge "Use static_cast for NULL to pointer type"android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Colin Cross
2022-01-11Use static_cast for NULL to pointer typeColin Cross
2021-02-21[automerger skipped] Mark ab/7061308 as merged in stage. am: 2dcabc8c56 -s ou...android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-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-devandroid12--mainline-releaseandroid-s-v2-preview-1Xin Li
2021-02-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/sfntly" am: 02f6219c5e am: 0...Bob Badour
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 2dcabc8c56 -s oursXin Li
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/sfntly" am: 02f6219c5e am: 0...Bob Badour
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/sfntly" am: 02f6219c5eBob Badour
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/sfntly"Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/sfntlyBob Badour
2020-11-25Mark ab/6881855 as merged am: 85df0bbd2c am: 52e4c6e58eXin Li
2020-11-25Mark ab/6881855 as merged am: 85df0bbd2cXin Li
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
2020-10-30Merge "Upgrade sfntly to 1e7adf313bd9c488a70015f8df8782f7c65e9ce7" am: a15ba1...Haibo Huang
2020-10-30Merge "Upgrade sfntly to 1e7adf313bd9c488a70015f8df8782f7c65e9ce7" am: a15ba1...Haibo Huang
2020-10-30Merge "Upgrade sfntly to 1e7adf313bd9c488a70015f8df8782f7c65e9ce7" am: a15ba1...Haibo Huang
2020-10-30Merge "Upgrade sfntly to 1e7adf313bd9c488a70015f8df8782f7c65e9ce7" am: a15ba1...Haibo Huang
2020-10-30Merge "Upgrade sfntly to 1e7adf313bd9c488a70015f8df8782f7c65e9ce7"Haibo Huang
2020-10-30Upgrade sfntly to 1e7adf313bd9c488a70015f8df8782f7c65e9ce7Haibo Huang
2020-04-24Merge "Add license type: contains zlib is NOTICE license" am: 6f0cb758bf am: ...Bob Badour
2020-04-24Merge "Add license type: contains zlib is NOTICE license" am: 6f0cb758bf am: ...Bob Badour
2020-04-24Merge "Add license type: contains zlib is NOTICE license" am: 6f0cb758bf am: ...Bob Badour
2020-04-24Merge "Add license type: contains zlib is NOTICE license" am: 6f0cb758bf am: ...Bob Badour
2020-04-24Merge "Add license type: contains zlib is NOTICE license" am: 6f0cb758bfandroid-r-beta-3android-r-beta-2Bob Badour
2020-04-24Merge "Add license type: contains zlib is NOTICE license"Bob Badour
2020-04-23Add license type: contains zlib is NOTICE licenseBob Badour
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
2020-03-26Merge "Remove redundant NOTICE symbolic link." am: 062e0dc4cb am: 8b568db69b ...Treehugger Robot
2020-03-26Merge "Remove redundant NOTICE symbolic link." am: 062e0dc4cb am: 8b568db69b ...Treehugger Robot
2020-03-26Merge "Remove redundant NOTICE symbolic link." am: 062e0dc4cb am: 8b568db69b ...Treehugger Robot
2020-03-26Merge "Remove redundant NOTICE symbolic link." am: 062e0dc4cb am: 8b568db69bTreehugger Robot
2020-03-26Merge "Remove redundant NOTICE symbolic link." am: 062e0dc4cb am: 8b568db69bTreehugger Robot
2020-03-26Merge "Remove redundant NOTICE symbolic link." am: 062e0dc4cbTreehugger Robot
2020-03-26Merge "Remove redundant NOTICE symbolic link."Treehugger Robot
2020-03-25Remove redundant NOTICE symbolic link.Bob Badour
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-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_r10android11-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-releaseXin 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-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-09-16Merge pull request #110 from jfkthame/patch-2upstream-masterCosimo Lupo
2019-09-16Restore space before "Regular" font name suffixjfkthame
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ...Xin Li
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ...Xin Li
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ...Xin Li
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ...Xin Li
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ...Xin Li