summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge Android 12HEADmasterXin Li2021-10-063-26/+3
|\
| * Merge sc-dev-plus-aosp-without-vendor@7634622Xin Li2021-08-143-26/+3
|/|
| * Add READ_VOICEMAIL permission to CallLogBackupAgent. am: 08186f1553Grace Jia2021-05-101-0/+1
| |\
| | * Add READ_VOICEMAIL permission to CallLogBackupAgent.android12-devGrace Jia2021-05-101-0/+1
| |/
| * [automerger skipped] Mark ab/7061308 as merged in stage. am: 94d45bf10a -s ou...Xin Li2021-02-210-0/+0
| |\
| | * [automerger skipped] Mark ab/7061308 as merged in stage. am: 94d45bf10a -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
|\ \ \
| | * | [LSC] Add LOCAL_LICENSE_KINDS to packages/providers/CallLogProvider am: 2ea00...Bob Badour2021-02-212-0/+26
| | |\|
| | | * [LSC] Add LOCAL_LICENSE_KINDS to packages/providers/CallLogProvider am: 2ea00...Bob Badour2021-02-192-0/+26
| | |/| | |/|/ | |/| |/| |
* | | [LSC] Add LOCAL_LICENSE_KINDS to packages/providers/CallLogProvider am: 2ea00...Bob Badour2021-02-192-0/+26
|\ \ \
| * | | [LSC] Add LOCAL_LICENSE_KINDS to packages/providers/CallLogProviderBob Badour2021-02-122-0/+26
|/ / /
| | * Mark ab/6881855 as merged am: 8443c456c0 am: ce3966dab2Xin Li2020-11-230-0/+0
| | |\ | | |/ | |/|
| * | Mark ab/6881855 as merged am: 8443c456c0Xin Li2020-11-230-0/+0
| |\ \ | |/ / |/| |
* | | Mark ab/6881855 as mergedandroid-s-preview-1Xin Li2020-11-230-0/+0
|\ \ \
| | | * [automerger skipped] Add missed information relative field. am: 368da290fc am...Grace Jia2020-11-040-0/+0
| | | |\ | | | |/ | | |/|
| | * | Add missed information relative field. am: 368da290fc am: 8904174583 am: 84ad...Grace Jia2020-11-041-3/+15
| | |\ \
| | | * \ Add missed information relative field. am: 368da290fc am: 8904174583Grace Jia2020-11-041-3/+15
| | | |\ \ | |_|_|/ / |/| | | |
* | | | | Add missed information relative field. am: 368da290fcGrace Jia2020-11-041-3/+15
|\ \ \ \ \
| * | | | | Add missed information relative field.Grace Jia2020-10-261-3/+15
|/ / / / /
| | | | * Add missed information relative field.Grace Jia2020-10-091-3/+15
| | | | * [automerger skipped] Skip ab/6749736 in stage. am: 133d1739bf -s ours am: ff1...Xin Li2020-10-090-0/+0
| | | | |\ | | | |_|/ | | |/| |
| | * | | [automerger skipped] Skip ab/6749736 in stage. am: 133d1739bf -s ours am: ff1...Xin Li2020-10-090-0/+0
| |/| | | | | |/ /
| | * | [automerger skipped] Skip ab/6749736 in stage. am: 133d1739bf -s oursXin Li2020-10-090-0/+0
| | |\ \ | |_|/ / |/| | |
* | | | Skip ab/6749736 in stage.Xin Li2020-10-080-0/+0
|\ \ \ \
| | | | * [automerger skipped] Merge Android R am: 4bc06ac1af -s ours am: e1158d8c0d -s...Xin Li2020-09-110-0/+0
| | | | |\ | | | |_|/ | | |/| |
| | * | | [automerger skipped] Merge Android R am: 4bc06ac1af -s ours am: e1158d8c0d -s...Xin Li2020-09-110-0/+0
| | |\| |
| | | * | [automerger skipped] Merge Android R am: 4bc06ac1af -s ours am: e1158d8c0d -s...Xin Li2020-09-110-0/+0
| | | |\ \
| | | | * \ [automerger skipped] Merge Android R am: 4bc06ac1af -s ours am: e1158d8c0d -s...Xin Li2020-09-110-0/+0
| | | | |\ \ | |_|_|_|/ / |/| | | | |
* | | | | | [automerger skipped] Merge Android R am: 4bc06ac1af -s oursXin Li2020-09-110-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge Android RXin Li2020-09-084-1/+3
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| | | | | | * [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-274-1/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| | | | * Remove check which was for L -> M updatesAl Sutton2020-05-302-26/+2
| | | | * Remove MODULE_LICENSE_APACHE2 from CallLogProvider am: 296f9d5a18 am: 54431b0...Bob Badour2020-04-281-0/+0
| | | | |\ | | | | |/ | | | |/|
| | | * | Remove MODULE_LICENSE_APACHE2 from CallLogProvider am: 296f9d5a18 am: 54431b0...Bob Badour2020-04-281-0/+0
| | | |\ \ | | | |/ / | | |/| |
| | * | | Remove MODULE_LICENSE_APACHE2 from CallLogProvider am: 296f9d5a18 am: 54431b0...Bob Badour2020-04-281-0/+0
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Remove MODULE_LICENSE_APACHE2 from CallLogProvider am: 296f9d5a18 am: 54431b0dc0Bob Badour2020-04-281-0/+0
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Remove MODULE_LICENSE_APACHE2 from CallLogProvider am: 296f9d5a18android-r-beta-3android-r-beta-2Bob Badour2020-04-281-0/+0
|\ \ \ \ \
| * | | | | Remove MODULE_LICENSE_APACHE2 from CallLogProviderBob Badour2020-04-271-0/+0
| | | | | * [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li2020-04-100-0/+0
| | | | | |\ | | | | | |/ | | | | |/|
| | | | * | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li2020-04-100-0/+0
| | | | |\ \ | | | | |/ / | | | |/| |
| | | * | | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li2020-04-100-0/+0
| | | |\ \ \ | | | |/ / / | | |/| | |
| | * | | | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li2020-04-100-0/+0
| | |\ \ \ \ | |_|/ / / / |/| | | | |
* | | | | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li2020-04-090-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Add an exported flag in manifest am: d702676ffb am: 953e1afdcfAshwini Oruganti2020-04-011-0/+1
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| | | | | | * Add an exported flag in manifest am: d702676ffb am: 953e1afdcf am: 180eecbbbb...Ashwini Oruganti2020-04-011-0/+1
| | | | | | |\ | | | | | | |/ | | | | | |/|
| | | | | * | Add an exported flag in manifest am: d702676ffb am: 953e1afdcf am: 180eecbbbb...Ashwini Oruganti2020-04-011-0/+1
| | | | | |\ \ | | | | | |/ / | | | | |/| / | | | | | |/