summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Merge Android 12"HEADmasterXin Li2021-10-071-2/+4
|\
| * Merge Android 12Xin Li2021-10-061-2/+4
|/|
| * Merge sc-dev-plus-aosp-without-vendor@7634622Xin Li2021-08-141-2/+4
|/|
| * Add READ_PHONE_NUMBERS permission to get phone account from Telecom. am: 91de...Grace Jia2021-06-221-2/+4
| |\
| | * Add READ_PHONE_NUMBERS permission to get phone account from Telecom.android12-devGrace Jia2021-06-211-2/+4
| |/
| * [automerger skipped] Mark ab/7061308 as merged in stage. am: 3dfeb14d28 -s ou...Xin Li2021-02-210-0/+0
| |\
| | * [automerger skipped] Mark ab/7061308 as merged in stage. am: 3dfeb14d28 -s oursXin Li2021-02-200-0/+0
| | |\ | |_|/ |/| |
* | | Mark 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 Li2021-02-200-0/+0
|\ \ \
| | * | Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/providers/UserDictionaryProv...Bob Badour2021-02-211-0/+19
| | |\|
| | | * Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/providers/UserDictionaryProv...Bob Badour2021-02-191-0/+19
| | |/| | |/|/ | |/| |/| |
* | | Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/providers/UserDictionaryProv...Bob Badour2021-02-191-0/+19
|\ \ \
| * | | Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/providers/UserDictionaryProv...Bob Badour2021-02-191-0/+19
|/| | |
| * | | [LSC] Add LOCAL_LICENSE_KINDS to packages/providers/UserDictionaryProviderBob Badour2021-02-121-0/+19
|/ / /
| | * Mark ab/6881855 as merged am: 059da03898 am: f8600c44c7Xin Li2020-11-230-0/+0
| | |\ | | |/ | |/|
| * | Mark ab/6881855 as merged am: 059da03898Xin Li2020-11-230-0/+0
| |\ \ | |/ / |/| |
* | | Mark ab/6881855 as mergedandroid-s-preview-1Xin Li2020-11-230-0/+0
|\ \ \
| | | * [automerger skipped] Skip ab/6749736 in stage. am: 4f0e12b894 -s ours am: 29f...Xin Li2020-10-090-0/+0
| | | |\ | | | |/ | | |/|
| | * | [automerger skipped] Skip ab/6749736 in stage. am: 4f0e12b894 -s ours am: 29f...Xin Li2020-10-090-0/+0
| |/| |
| | * | [automerger skipped] Skip ab/6749736 in stage. am: 4f0e12b894 -s oursXin Li2020-10-090-0/+0
| | |\ \ | |_|/ / |/| | |
* | | | Skip ab/6749736 in stage.Xin Li2020-10-080-0/+0
|\ \ \ \
| | | | * [automerger skipped] Merge "Merge Android R" am: 726339a27c -s ours am: b5a25...Xin Li2020-09-110-0/+0
| | | | |\ | | | |_|/ | | |/| |
| | * | | [automerger skipped] Merge "Merge Android R" am: 726339a27c -s ours am: b5a25...Xin Li2020-09-110-0/+0
| | |\| |
| | | * | [automerger skipped] Merge "Merge Android R" am: 726339a27c -s ours am: b5a25...Xin Li2020-09-110-0/+0
| | | |\ \
| | | | * \ [automerger skipped] Merge "Merge Android R" am: 726339a27c -s ours am: b5a25...Xin Li2020-09-110-0/+0
| | | | |\ \ | |_|_|_|/ / |/| | | | |
* | | | | | [automerger skipped] Merge "Merge Android R" am: 726339a27c -s oursXin Li2020-09-110-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge "Merge Android R"Xin Li2020-09-101-1/+1
| |\ \ \ \ \ \
| | * | | | | | Merge Android RXin Li2020-09-081-1/+1
| |/| | | | | | | |/ / / / / / |/| | | | | |
| | | | | | * [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@669270...Xin Li2020-09-020-0/+0
| | | | | | |\ | | | | |_|_|/ | | | |/| | |
| | | * | | | [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@669270...Xin Li2020-09-010-0/+0
| | | |\| | |
| | | | * | | [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@669270...Xin Li2020-09-010-0/+0
| | | |/| | | | | |/| |/ /
| | | | * | [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@669270...Xin Li2020-09-010-0/+0
| | | | |\ \ | |_|_|_|/ / |/| | | | |
* | | | | | Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li2020-08-271-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| | | | * Merge "Remove MODULE_LICENSE_APACHE2 from UserDictionaryProvider" am: e4285b0...Treehugger Robot2020-04-281-0/+0
| | | | |\ | | | | |/ | | | |/|
| | | * | Merge "Remove MODULE_LICENSE_APACHE2 from UserDictionaryProvider" am: e4285b0...Treehugger Robot2020-04-281-0/+0
| | | |\ \ | | | |/ / | | |/| / | | | |/
| | * | Merge "Remove MODULE_LICENSE_APACHE2 from UserDictionaryProvider" am: e4285b0...Treehugger Robot2020-04-281-0/+0
| | |\ \ | | |/ / | |/| / | | |/
| * | Merge "Remove MODULE_LICENSE_APACHE2 from UserDictionaryProvider" am: e4285b0...Treehugger Robot2020-04-281-0/+0
| |\ \ | |/ / |/| / | |/
* | Merge "Remove MODULE_LICENSE_APACHE2 from UserDictionaryProvider" am: e4285b0992android-r-beta-3android-r-beta-2Treehugger Robot2020-04-281-0/+0
|\ \
| * | Merge "Remove MODULE_LICENSE_APACHE2 from UserDictionaryProvider"Treehugger Robot2020-04-281-0/+0
|/| |
| * | Remove MODULE_LICENSE_APACHE2 from UserDictionaryProviderBob Badour2020-04-271-0/+0
|/ /
| * Merge "Merge Android10 QPR1 into AOSP master" am: 4848226fab am: 2150129abaandroid-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_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-releaseAutomerger Merge Worker2019-12-040-0/+0
| |\ | |/ |/|
* | Merge "Merge Android10 QPR1 into AOSP master" am: 4848226fabandroid-r-preview-4android-r-preview-3android-r-preview-2Xin Li2019-12-040-0/+0
|\ \
| * \ Merge "Merge Android10 QPR1 into AOSP master"Xin Li2019-12-030-0/+0
| |\ \
| | * \ Merge "Merge Android10 QPR1 into AOSP master"android-r-preview-1Treehugger Robot2019-12-031-1/+1
| | |\ \
| | | * | Merge Android10 QPR1 into AOSP masterXin Li2019-12-021-1/+1
| | |/| | | | |/ / | |/| |
| | | * [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915...Xin Li2019-10-310-0/+0
| | | |\ | |_|_|/ |/| | |
* | | | DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...Xin Li2019-10-310-0/+0
|\| | |
| * | | DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...Xin Li2019-10-301-1/+1
| |\ \ \
| | | | * [automerger skipped] Merge Coral/Flame into AOSP master am: 2f183eb436 -s our...Xin Li2019-10-260-0/+0
| | | | |\ | |_|_|_|/ |/| | | |
* | | | | [automerger skipped] Merge Coral/Flame into AOSP master am: 2f183eb436 -s our...Xin Li2019-10-260-0/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | [automerger skipped] Merge Coral/Flame into AOSP master am: 2f183eb436 -s oursXin Li2019-10-260-0/+0
| |\| | |
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-31 16:38:10 +0000