summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge Android 12HEADmasterXin Li2021-10-06210-716/+1795
|\
| * Fix license text -- switch to Android-Apache-2.0 am: 4bc189377dBob Badour2021-09-041-18/+15
| |\ | |/ |/|
* | Fix license text -- switch to Android-Apache-2.0android-s-beta-5android-s-beta-5Bob Badour2021-09-031-18/+15
| * Merge sc-dev-plus-aosp-without-vendor@7634622Xin Li2021-08-14210-739/+1818
| |\
| | * [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ...TreeHugger Robot2021-08-100-0/+0
| | |\
| | | * [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ...android12-devTreeHugger Robot2021-08-100-0/+0
| | | |\
| | | | * Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prodTreeHugger Robot2021-08-101-1/+1
| | | | |\
| | | | | * Import translations. DO NOT MERGE ANYWHEREBill Yi2021-08-101-1/+1
| | * | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 393a5b5a0...Bill Yi2021-08-100-0/+0
| | |\| | |
| | | * | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 393a5b5a0...Bill Yi2021-08-100-0/+0
| | | |\| |
| | | | * | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-08-101-1/+1
| | | | |/
| | * | | [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ...TreeHugger Robot2021-08-100-0/+0
| | |\| |
| | | * | [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ...TreeHugger Robot2021-08-100-0/+0
| | | |\ \
| | | | * \ Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-devTreeHugger Robot2021-08-101-1/+1
| | | | |\ \
| | | | | * | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-08-101-1/+1
| | * | | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fb7c0abc1...Bill Yi2021-08-100-0/+0
| | |\| | | |
| | | * | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fb7c0abc1...Bill Yi2021-08-100-0/+0
| | | |\| | |
| | | | * | | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-08-101-1/+1
| | | | |/ /
| | * | | | [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ...TreeHugger Robot2021-08-100-0/+0
| | |\| | |
| | | * | | Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-devTreeHugger Robot2021-08-101-1/+1
| | | |\ \ \
| | | | * | | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-08-101-1/+1
| | * | | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 493ea6003...Bill Yi2021-08-100-0/+0
| | |\| | | |
| | | * | | | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-08-101-1/+1
| | | |/ / /
| | * | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cc1d1ce1e...Bill Yi2021-08-070-0/+0
| | |\| | |
| | | * | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cc1d1ce1e...Bill Yi2021-08-070-0/+0
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-08-071-27/+27
| | * | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9c2b10201...Bill Yi2021-08-070-0/+0
| | |\| | |
| | | * | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9c2b10201...Bill Yi2021-08-070-0/+0
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-08-071-27/+27
| | * | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d002c358...Bill Yi2021-08-070-0/+0
| | |\| | |
| | | * | | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-08-071-27/+27
| | * | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c74b63bc0...Bill Yi2021-08-010-0/+0
| | |\| | |
| | | * | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c74b63bc0...Bill Yi2021-08-010-0/+0
| | | |\| |
| | | | * | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-07-311-4/+4
| | * | | | [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ...TreeHugger Robot2021-08-010-0/+0
| | |\| | |
| | | * | | Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-devTreeHugger Robot2021-08-011-4/+4
| | | |\ \ \
| | | | * | | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-07-311-4/+4
| | * | | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96780d509...Bill Yi2021-08-010-0/+0
| | |\| | | |
| | | * | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96780d509...Bill Yi2021-08-010-0/+0
| | | |\ \ \ \ | | | | |/ / / | | | |/| | / | | | | | |/ | | | | |/|
| | | | * | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-07-311-4/+4
| | * | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b62594ba1...Bill Yi2021-07-280-0/+0
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-07-285-23/+23
| | * | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6d46b5474...Bill Yi2021-07-240-0/+0
| | |\| | |
| | | * | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6d46b5474...Bill Yi2021-07-240-0/+0
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-07-231-1/+1
| | * | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d581709b1...Bill Yi2021-07-230-0/+0
| | |\| | |
| | | * | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d581709b1...Bill Yi2021-07-230-0/+0
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-07-231-1/+1
| | * | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2dee58cf...Bill Yi2021-07-230-0/+0
| | |\| | |
| | | * | | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-07-231-1/+1