summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Merge Android 12"HEADmasterXin Li2021-10-071-1/+1
|\
| * Merge Android 12Xin Li2021-10-061-1/+1
|/|
| * Merge sc-dev-plus-aosp-without-vendor@7634622Xin Li2021-08-141-1/+1
| |\
| | * Merge "Fix Colors crashing on rotation" am: e6bb5cbc7c am: 0388b59400Galia Peycheva2021-08-021-8/+8
| | |\ | | |/ | |/|
| * | Merge "Fix Colors crashing on rotation" am: e6bb5cbc7cGalia Peycheva2021-08-021-8/+8
| |\ \ | |/ / |/| |
* | | Merge "Fix Colors crashing on rotation"android-s-beta-5android-s-beta-5Galia Peycheva2021-08-021-8/+8
|\ \ \
| * | | Fix Colors crashing on rotationGalia Peycheva2021-08-021-8/+8
|/ / /
| | * [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 0...Treehugger Robot2021-07-040-0/+0
| | |\ | | |/ | |/|
| * | [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 0...Treehugger Robot2021-07-040-0/+0
| |\ \ | |/ / |/| |
* | | Merge "Import translations. DO NOT MERGE ANYWHERE"android-s-beta-4android-s-beta-3android-s-beta-4Treehugger Robot2021-07-041-1/+1
|\ \ \
| * | | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-07-031-1/+1
|/ / /
| | * [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee3502ce5...Bill Yi2021-07-040-0/+0
| | |\ | | |/ | |/|
| * | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-07-041-1/+1
|/ /
| * [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d9fd27df...Bill Yi2021-06-010-0/+0
| |\
| | * [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d9fd27df...android12-devBill Yi2021-06-010-0/+0
| | |\
| | | * Import translations. DO NOT MERGE ANYWHEREBill Yi2021-05-311-1/+1
| * | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 434901289...Bill Yi2021-06-010-0/+0
| |\| |
| | * | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 434901289...Bill Yi2021-06-010-0/+0
| | |\ \
| | | * | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-05-311-1/+1
| * | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b1326e86c...Bill Yi2021-06-010-0/+0
| |\| | |
| | * | | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-05-311-1/+1
| |/ / /
| * | | [automerger skipped] Mark ab/7061308 as merged in stage. am: e00bb426e9 -s ou...Xin Li2021-02-210-0/+0
| |\ \ \
| | * \ \ [automerger skipped] Mark ab/7061308 as merged in stage. am: e00bb426e9 -s oursXin Li2021-02-200-0/+0
| | |\ \ \ | |_|/ / / |/| | | |
* | | | | Mark ab/7061308 as merged in stage.android-s-beta-2android-s-beta-1Xin Li2021-02-200-0/+0
|\ \ \ \ \
| | * | | | Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/screensavers/Basic" am: 8bf9...Bob Badour2021-02-211-0/+4
| | |\| | |
| | | * | | Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/screensavers/Basic" am: 8bf9...Bob Badour2021-02-191-0/+4
| | |/| | | | |/|/ / / | |/| | | |/| | | |
* | | | | Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/screensavers/Basic" am: 8bf9...Bob Badour2021-02-191-0/+4
|\ \ \ \ \
| * | | | | Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/screensavers/Basic"Bob Badour2021-02-191-0/+4
|/| | | | |
| * | | | | [LSC] Add LOCAL_LICENSE_KINDS to packages/screensavers/BasicBob Badour2021-02-121-0/+4
|/ / / / /
| | * | | Mark ab/6881855 as merged am: 3bf7994765 am: 17fa819502Xin Li2020-11-230-0/+0
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Mark ab/6881855 as merged am: 3bf7994765Xin Li2020-11-230-0/+0
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Mark ab/6881855 as mergedandroid-s-preview-1Xin Li2020-11-230-0/+0
|\ \ \ \ \
| | | * | | Revert "Import translations. DO NOT MERGE ANYWHERE"Bill Yi2020-11-2085-0/+1785
| | | * | | Import translations. DO NOT MERGE ANYWHEREBill Yi2020-11-1985-1785/+0
| | | * | | [automerger skipped] Skip ab/6749736 in stage. am: 7301a767ea -s ours am: 0c2...Xin Li2020-10-090-0/+0
| | | |\ \ \ | | | |/ / / | | |/| | |
| | * | | | [automerger skipped] Skip ab/6749736 in stage. am: 7301a767ea -s ours am: 0c2...Xin Li2020-10-090-0/+0
| |/| | | |
| | * | | | [automerger skipped] Skip ab/6749736 in stage. am: 7301a767ea -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: a3e1235f8a -s ours am: bb084...Xin Li2020-09-110-0/+0
| | | | |\ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | [automerger skipped] Merge "Merge Android R" am: a3e1235f8a -s ours am: bb084...Xin Li2020-09-110-0/+0
| | |\| | | |
| | | * | | | [automerger skipped] Merge "Merge Android R" am: a3e1235f8a -s ours am: bb084...Xin Li2020-09-110-0/+0
| | | |\ \ \ \
| | | | * \ \ \ [automerger skipped] Merge "Merge Android R" am: a3e1235f8a -s ours am: bb084...Xin Li2020-09-110-0/+0
| | | | |\ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | [automerger skipped] Merge "Merge Android R" am: a3e1235f8a -s oursXin Li2020-09-110-0/+0
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge "Merge Android R"Xin Li2020-09-102-2/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Merge Android RXin Li2020-09-082-2/+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-272-2/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-02 21:40:53 +0000