aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 0056347f7d -s ours am: 1427...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-1Xin Li
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 0056347f7d -s ours am: 1427...Xin Li
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 0056347f7d -s oursXin Li
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-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: f1b61e...Xin Li
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: f1b61e...Xin Li
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622temp_sam_202323961Xin Li
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 189dd28362 -s ou...android-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-releaseXin Li
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 189dd28362 -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-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/marisa-trie" am: e431b540ab ...Treehugger Robot
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/marisa-trie" am: e431b540ab ...Treehugger Robot
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/marisa-trie" am: e431b540abTreehugger Robot
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/marisa-trie"android-s-preview-1Treehugger Robot
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/marisa-trieBob Badour
2021-01-22Merge "Fix license_type. "AND GPL"" am: 2755ec422c am: 2106d984d9 am: 2340e8d75dBob Badour
2021-01-22Merge "Fix license_type. "AND GPL"" am: 2755ec422c am: 2106d984d9Bob Badour
2021-01-22Merge "Fix license_type. "AND GPL"" am: 2755ec422cBob Badour
2021-01-22Merge "Fix license_type. "AND GPL""Bob Badour
2021-01-21Fix license_type. "AND GPL"Bob Badour
2020-11-24Mark ab/6881855 as merged am: 2c82f6be73 am: c9570b2a21Xin Li
2020-11-24Mark ab/6881855 as merged am: 2c82f6be73Xin Li
2020-11-23Mark ab/6881855 as mergedXin Li
2020-11-03[automerger skipped] Set min_sdk_version to be 30 am: ae3315be4a -s oursTony Mak
2020-11-03Set min_sdk_version to be 30android-mainline-11.0.0_r44android-mainline-11.0.0_r23android-mainline-11.0.0_r15android11-mainline-os-statsd-releaseandroid11-mainline-extservices-releaseTony Mak
2020-11-02Set min_sdk_version to be 30Tony Mak
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: d73a42d329 -s ours am: a05...Xin Li
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: d73a42d329 -s ours am: a05...Xin Li
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: d73a42d329 -s oursXin Li
2020-10-08Skip ab/6749736 in stage.Xin Li
2020-09-29Merge "Sync https://github.com/s-yata/marisa-trie/pull/32" am: 4dc2729a1c am:...Treehugger Robot
2020-09-29Merge "Sync https://github.com/s-yata/marisa-trie/pull/32" am: 4dc2729a1c am:...Treehugger Robot
2020-09-29Merge "Sync https://github.com/s-yata/marisa-trie/pull/32" am: 4dc2729a1c am:...Treehugger Robot
2020-09-29Merge "Sync https://github.com/s-yata/marisa-trie/pull/32" am: 4dc2729a1c am:...Treehugger Robot
2020-09-29Merge "Sync https://github.com/s-yata/marisa-trie/pull/32" am: 4dc2729a1cTreehugger Robot
2020-09-29Merge "Sync https://github.com/s-yata/marisa-trie/pull/32"platform-tools-30.0.5Treehugger Robot
2020-09-28Sync https://github.com/s-yata/marisa-trie/pull/32Tony Mak
2020-08-27[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709...android-mainline-11.0.0_r9android-mainline-11.0.0_r35android-mainline-11.0.0_r3android-mainline-11.0.0_r29android11-mainline-sparse-2020-dec-releaseXin 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-07-23Merge "Create Android.bp for marisa-trie" am: 01a997e6df am: 5479e9926e am: 9...Tony Mak
2020-07-23Merge "Create Android.bp for marisa-trie" am: 01a997e6df am: 5479e9926e am: 9...Tony Mak
2020-07-23Merge "Create Android.bp for marisa-trie" am: 01a997e6df am: 5479e9926e am: 9...Tony Mak
2020-07-23Merge "Create Android.bp for marisa-trie" am: 01a997e6df am: 5479e9926eTony Mak
2020-07-23Merge "Create Android.bp for marisa-trie" am: 01a997e6dfTony Mak
2020-07-23Merge "Create Android.bp for marisa-trie"Tony Mak
2020-07-22Create Android.bp for marisa-trieTony Mak
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 15:01:53 +0000