summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 6...HEADmasterTreehugger Robot2020-09-060-0/+0
|\
| * Merge "Import translations. DO NOT MERGE ANYWHERE"Treehugger Robot2020-09-060-0/+0
| |\
| | * Import translations. DO NOT MERGE ANYWHEREBill Yi2020-09-0585-170/+170
* | | [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 8...Treehugger Robot2020-09-060-0/+0
|\| |
| * | Merge "Import translations. DO NOT MERGE ANYWHERE"Treehugger Robot2020-09-060-0/+0
| |\ \
| | * | Import translations. DO NOT MERGE ANYWHEREBill Yi2020-09-0585-850/+850
| | |/
* | | [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2...Treehugger Robot2020-09-050-0/+0
|\| |
| * | Merge "Import translations. DO NOT MERGE ANYWHERE"Treehugger Robot2020-09-0585-850/+850
| |\ \
| | * | Import translations. DO NOT MERGE ANYWHEREBill Yi2020-09-0585-850/+850
| | |/
* | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 25eea95e5...Bill Yi2020-09-050-0/+0
|\| |
| * | Import translations. DO NOT MERGE ANYWHEREBill Yi2020-09-0585-170/+170
| |/
* | Import translations. DO NOT MERGE ANYWHEREBill Yi2020-09-032-4/+4
* | Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li2020-08-27170-1020/+1020
|\ \ | |/ |/|
| * [automerger skipped] Import translations. DO NOT MERGE am: 85185fe58f -s ours...Bill Yi2020-05-160-0/+0
| |\
| | * [automerger skipped] Import translations. DO NOT MERGE am: 85185fe58f -s oursandroid11-devBill Yi2020-05-160-0/+0
| | |\
| | | * Import translations. DO NOT MERGEBill Yi2020-05-162-4/+4
| * | | [automerger skipped] Import translations. DO NOT MERGE am: 7ad59df5ed -s oursBill Yi2020-04-280-0/+0
| |\| |
| | * | Import translations. DO NOT MERGEBill Yi2020-04-282-4/+4
| * | | [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-masterandroid-r-beta-3android-r-beta-2Xin Li2020-04-090-0/+0
|\ \ \ \
| * \ \ \ DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-maste...Xin Li2020-03-190-0/+0
| |\ \ \ \ | |/ / / / |/| | | |
| | * | | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901...Xin Li2020-03-190-0/+0
| | |\ \ \ | |_|/ / / |/| | | |
* | | | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-masterXin Li2020-03-180-0/+0
|\| | | |
| * | | | Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 558c496c8f am: 13b8...Automerger Merge Worker2020-03-060-0/+0
| |\ \ \ \ | |/ / / / |/| | | |
| | * | | [automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE am...Automerger Merge Worker2020-03-060-0/+0
| | |\ \ \ | |_|/ / / |/| | / / | | |/ /
* | | | Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 558c496c8fAutomerger Merge Worker2020-03-060-0/+0
|\ \ \ \
| * \ \ \ Merge stage-aosp-master to aosp-master - DO NOT MERGEandroid-r-preview-4android-r-preview-3android-r-preview-2Bill Yi2020-03-05170-1020/+1020
| |\ \ \ \ | |/ / / / |/| | | |
| | | * | [automerger skipped] Import translations. DO NOT MERGE am: 5c7f635e3e -s ours...Automerger Merge Worker2020-02-010-0/+0
| | | |\ \ | | | |/ / | | |/| |
| | * | | [automerger skipped] Import translations. DO NOT MERGE am: 5c7f635e3e -s ours...Automerger Merge Worker2020-02-010-0/+0
| | |\ \ \ | |_|/ / / |/| | | |
* | | | | [automerger skipped] Import translations. DO NOT MERGE am: 5c7f635e3e -s oursandroid10-sidebranchAutomerger Merge Worker2020-02-010-0/+0
|\| | | | | |/ / / |/| | |
| * | | Import translations. DO NOT MERGEandroid-r-preview-1Bill Yi2020-02-01170-1020/+1020
| | * | Merge Android10 QPR1 into AOSP master am: 2b760228b9 am: d9b9e97926Automerger Merge Worker2019-12-040-0/+0
| | |\ \ | |_|/ / |/| | |
* | | | Merge Android10 QPR1 into AOSP master am: 2b760228b9Xin Li2019-12-040-0/+0
|\ \ \ \
| * | | | Merge Android10 QPR1 into AOSP masterXin Li2019-12-030-0/+0
| |\| | |
| | * | | Merge Android10 QPR1 into AOSP masterXin Li2019-12-025-5/+5
| | |\ \ \ | | |/ / / | |/| | |
| | | * | Import translations. DO NOT MERGEBill Yi2019-11-101-1/+1
| | | * | [automerger skipped] Import translations. DO NOT MERGE am: b71789b3b1 -s oursBill Yi2019-11-090-0/+0
| | | |\ \ | |_|_|/ / |/| | | |
* | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2019-11-090-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Import translations. DO NOT MERGEandroid-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android10-qpr3-s1-releaseandroid10-qpr3-releaseBill Yi2019-11-09170-1020/+1020
| | | | * [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-305-5/+5
| |\ \ \ \
| | | | | * [automerger skipped] Merge Coral/Flame into AOSP master am: ef4c283cb1 -s our...Xin Li2019-10-260-0/+0
| | | | | |\ | |_|_|_|_|/ |/| | | | |
* | | | | | [automerger skipped] Merge Coral/Flame into AOSP master am: ef4c283cb1 -s our...Xin Li2019-10-260-0/+0
|\ \ \ \ \ \
| * | | | | | [automerger skipped] Merge Coral/Flame into AOSP master am: ef4c283cb1 -s oursXin Li2019-10-260-0/+0
| |\| | | | |
| | * | | | | [automerger skipped] Merge Coral/Flame into AOSP masterXin Li2019-10-260-0/+0
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Merge Coral/Flame into AOSP masterXin Li2019-10-255-5/+5
| | | |\ \ \ \ | | | |/ / / / | | |/| | | |
| | | | | | * Import translations. DO NOT MERGEBill Yi2019-10-22170-1020/+1020
| | | | | | * Skip QD1A.190821.011 in stage-aosp-master am: 9367d1beb7 am: 0f07db7febXin Li2019-10-160-0/+0
| | | | | | |\ | |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Skip QD1A.190821.011 in stage-aosp-master am: 9367d1beb7Xin Li2019-10-160-0/+0
|\| | | | | | | |_|_|/ / / |/| | | | |