summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Merge Android 12"HEADmasterXin Li2021-10-0717-270/+369
|\
| * Merge Android 12Xin Li2021-10-0617-270/+369
|/|
| * Merge sc-dev-plus-aosp-without-vendor@7634622Xin Li2021-08-1417-270/+369
|/|
| * Actually stop running when job is stopped. am: e2ca493505Kweku Adams2021-07-261-0/+7
| |\
| | * Actually stop running when job is stopped.android12-devKweku Adams2021-07-231-0/+7
| * | [automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: dfdd6c...Xin Li2021-06-180-0/+0
| |\ \ | |/ / |/| |
* | | DO NOT MERGE - Mark RQ3A.210410.001 as mergedandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Xin Li2021-06-170-0/+0
|\ \ \
| * \ \ Snap for 7187929 from aa4273212f161b96429dd2443daf7c274bc3c1f6 to rvc-qpr3-re...android-11.0.0_r46android-11.0.0_r43android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid-build-team Robot2021-03-052-0/+8
| |\ \ \
| | | * \ Merge "DO NOT MERGE - Merge ab/7272582" am: 7999f23e0d am: 44da8e6ce8Xin Li2021-06-140-0/+0
| | | |\ \ | |_|_|/ / |/| | | |
* | | | | Merge "DO NOT MERGE - Merge ab/7272582" am: 7999f23e0dXin Li2021-06-140-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge "DO NOT MERGE - Merge ab/7272582"Xin Li2021-06-140-0/+0
| |\ \ \ \ \
| | | | | * \ DO NOT MERGE - Merge ab/7272582 am: eb35161303 am: df337f4de4Xin Li2021-06-140-0/+0
| | | | | |\ \ | |_|_|_|_|/ / |/| | | | | |
* | | | | | | DO NOT MERGE - Merge ab/7272582 am: eb35161303Xin Li2021-06-140-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | DO NOT MERGE - Merge ab/7272582Xin Li2021-06-110-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | | | | * | [automerger skipped] Merge "DO NOT MERGE - Merge RQ2A.210505.003." am: 6691c7...Treehugger Robot2021-05-080-0/+0
| | | | | |\|
| | | | | | * [automerger skipped] Merge "DO NOT MERGE - Merge RQ2A.210505.003." am: 6691c7...Treehugger Robot2021-05-080-0/+0
| | | | | | |\
| | | | | | | * [automerger skipped] Merge "DO NOT MERGE - Merge RQ2A.210505.003." am: 6691c7...Treehugger Robot2021-05-080-0/+0
| | | | | | | |\ | |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge "DO NOT MERGE - Merge RQ2A.210505.003." am: 6691c7847eTreehugger Robot2021-05-080-0/+0
|\| | | | | | |
| * | | | | | | Merge "DO NOT MERGE - Merge RQ2A.210505.003."android-s-beta-2android-s-beta-1Treehugger Robot2021-05-082-0/+8
| |\ \ \ \ \ \ \
| | | | | | * | | [automerger skipped] DO NOT MERGE - Merge RQ2A.210505.003. am: def763b31d am:...Xin Li2021-05-080-0/+0
| | | | | | |\| |
| | | | | | | * | [automerger skipped] DO NOT MERGE - Merge RQ2A.210505.003. am: def763b31d am:...Xin Li2021-05-080-0/+0
| | | | | | |/| | | | | | | | | |/
| | | | | | | * [automerger skipped] DO NOT MERGE - Merge RQ2A.210505.003. am: def763b31d am:...Xin Li2021-05-080-0/+0
| | | | |_|_|/| | | | |/| | |/ | | | | | |/| | | | | |/| | | | | |/| | | | | |/| | | | | |/| | | | | |/| | | | | |
* | | | | | | DO NOT MERGE - Merge RQ2A.210505.003. am: def763b31dXin Li2021-05-082-0/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | DO NOT MERGE - Merge RQ2A.210505.003.Xin Li2021-05-072-0/+8
|/| | | | |
| * | | | | Merge cherrypicks of [13924074, 13924075, 13924587, 13923962, 13924417, 13924...android-11.0.0_r37android-11.0.0_r36android11-qpr2-releaseandroid-build-team Robot2021-03-192-0/+8
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Add SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS to CalendarDebugActivityMakoto Onuki2021-03-192-0/+8
| |/ / / /
| | | | * Merge "Use expedited to job to update alarms." into sc-devTreeHugger Robot2021-04-283-28/+93
| | | | |\
| | | | | * Use expedited to job to update alarms.Kweku Adams2021-04-283-28/+93
| | | | * | Disable the calendar provider strict SQL check for nowMakoto Onuki2021-04-271-2/+2
| | | | |/
| | | | * Remove SCHEDULE_EXACT_ALARM permissionSuprabh Shukla2021-04-091-1/+0
| | | | * Add SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS to CalendarDebugActivity am: ...Makoto Onuki2021-03-050-0/+0
| | | | |\ | | | |_|/ | | |/| |
| | * | | Add SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS to CalendarDebugActivity am: ...Makoto Onuki2021-03-052-0/+8
| | |\| |
| | | * | Add SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS to CalendarDebugActivity am: ...Makoto Onuki2021-03-052-0/+8
| | |/| | | |/| | |
| | | | * Add SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS to CalendarDebugActivity am: ...Makoto Onuki2021-03-052-0/+8
| | | | |\
| | | | | * Add SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS to CalendarDebugActivity am: ...Makoto Onuki2021-03-052-0/+8
| | |_|_|/| | |/| | |/ | | | |/|
| | | * | Add SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS to CalendarDebugActivityMakoto Onuki2021-02-102-0/+8
| | |/ / | |/| |
| | | * Add exact alarm permission to CalendarProviderSuprabh Shukla2021-03-012-1/+1
| | | * [automerger skipped] Mark ab/7061308 as merged in stage. am: 9e5e246585 -s ou...Xin Li2021-02-210-0/+0
| | | |\ | | | |/ | | |/|
| | * | [automerger skipped] Mark ab/7061308 as merged in stage. am: 9e5e246585 -s oursXin Li2021-02-200-0/+0
| | |\ \ | |_|/ / |/| | |
* | | | Mark ab/7061308 as merged in stage.Xin Li2021-02-200-0/+0
|\ \ \ \
| | | | * Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/providers/CalendarProvider" ...Bob Badour2021-02-212-0/+30
| | | | |\ | | | | |/ | | | |/|
| | | * | Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/providers/CalendarProvider" ...Bob Badour2021-02-192-0/+30
| | |/| | | |/|/ / | |/| | |/| | |
* | | | Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/providers/CalendarProvider" ...Bob Badour2021-02-192-0/+30
|\ \ \ \
| * | | | Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/providers/CalendarProvider"Bob Badour2021-02-192-0/+30
|/| | | |
| * | | | [LSC] Add LOCAL_LICENSE_KINDS to packages/providers/CalendarProviderBob Badour2021-02-122-0/+30
|/ / / /
| | | * Mark ab/6881855 as merged am: b76fe0607e am: 5454fbe784Xin Li2020-11-230-0/+0
| | | |\ | | |_|/ | |/| |
| * | | Mark ab/6881855 as merged am: b76fe0607eXin Li2020-11-230-0/+0
| |\ \ \ | |/ / / |/| | |
* | | | Mark ab/6881855 as mergedandroid-s-preview-1Xin Li2020-11-230-0/+0
|\ \ \ \
| | | | * Merge "Update Time API usage."Varun Shah2020-10-276-94/+95
| | | | |\
| | | | | * Update Time API usage.Varun Shah2020-10-136-94/+95