summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [automerger skipped] Import translations. DO NOT MERGEandroid10-devBill Yi2019-05-180-0/+0
|\
| * Import translations. DO NOT MERGEBill Yi2019-05-1741-86/+86
* | Import translations. DO NOT MERGEBill Yi2019-05-1719-27/+27
* | Import translations. DO NOT MERGEBill Yi2019-04-242-2/+2
* | Import translations. DO NOT MERGEBill Yi2019-04-1629-57/+57
* | [automerger skipped] Import translations. DO NOT MERGEBill Yi2019-04-060-0/+0
|\|
| * Import translations. DO NOT MERGEBill Yi2019-04-051-3/+3
* | Import translations. DO NOT MERGEBill Yi2019-04-051-3/+3
* | Merge "Properly set RESULT_OK for Deletion Helper."Daniel Nishi2019-03-282-5/+87
|\ \
| * | Properly set RESULT_OK for Deletion Helper.Daniel Nishi2019-03-272-5/+87
* | | [automerger skipped] Import translations. DO NOT MERGE am: 638fd73685 -s oursBill Yi2019-03-270-0/+0
|\ \ \
| * \ \ [automerger skipped] Import translations. DO NOT MERGEBill Yi2019-03-270-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | Import translations. DO NOT MERGEBill Yi2019-03-2615-15/+15
* | | | [automerger skipped] StorageManagerAppTests: Remove obsolete reference to bou...Narayan Kamath2019-03-260-0/+0
|\| | | | |_|/ |/| |
| * | StorageManagerAppTests: Remove obsolete reference to bouncycastle. am: fd9414...Narayan Kamath2019-03-261-1/+1
| |\ \
| | * \ StorageManagerAppTests: Remove obsolete reference to bouncycastle.Narayan Kamath2019-03-261-1/+1
| | |\ \
| | | * | StorageManagerAppTests: Remove obsolete reference to bouncycastle.android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5Narayan Kamath2019-03-251-1/+1
* | | | | Import translations. DO NOT MERGEBill Yi2019-03-0115-15/+15
* | | | | [automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-mast...Xin Li2019-02-250-0/+0
|\| | | |
| * | | | [automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-250-0/+0
| |\| | |
| | * | | DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-2184-150/+150
| | |\ \ \
* | | \ \ \ Merge "Flesh out CR.getTypeDrawable() with more details."Jeff Sharkey2019-02-211-1/+1
|\ \ \ \ \ \
| * | | | | | Flesh out CR.getTypeDrawable() with more details.Jeff Sharkey2019-02-191-1/+1
* | | | | | | [automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: 146...Xin Li2019-02-200-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | [automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: 146...Xin Li2019-02-200-0/+0
| |\| | | |
| | * | | | [automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into masterXin Li2019-02-200-0/+0
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | DO NOT MERGE - Merge PPRL.190205.001 into masterandroid-q-preview-1android-o-mr1-iot-release-1.0.10Xin Li2019-02-183-9/+9
| | | |\ \ \ | | | |/ / / | | |/| | |
* | | | | | [automerger skipped] Import translations. DO NOT MERGE am: 0ab79c3ece -s oursBill Yi2019-02-170-0/+0
|\| | | | |
| * | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2019-02-170-0/+0
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Import translations. DO NOT MERGEBill Yi2019-02-173-42/+42
* | | | | | [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.00...Xin Li2019-02-140-0/+0
|\| | | | |
| * | | | | [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.00...Xin Li2019-02-140-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-ma...Xin Li2019-02-123-9/+9
| | |\ \ \ \
| | | * \ \ \ Snap for 5180536 from 4a77f5722ef989bcc2f9c8b6c1360ada31f24fee to pi-platform...android-build-team Robot2019-02-094-11/+11
| | | |\ \ \ \
| | | | * \ \ \ Snap for 5130385 from c193436a5e829771b313c48b0c3980af56c394e9 to pi-qpr2-rel...android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31pie-qpr2-releaseandroid-build-team Robot2018-11-141-1/+1
| | | | |\ \ \ \
| | | | * \ \ \ \ Snap for 5115288 from 33817b4fd02f0a8b585923a75f26c2a1fb19b4ad to pi-qpr2-rel...android-build-team Robot2018-11-072-8/+8
| | | | |\ \ \ \ \
| | | | * \ \ \ \ \ Snap for 5073521 from a7e25bbef0b73500b275da2dcbc9ebcfee4b4981 to pi-qpr2-rel...android-build-team Robot2018-10-171-2/+2
| | | | |\ \ \ \ \ \
* | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2019-02-022-41/+41
* | | | | | | | | | | Merge "Fix bug in warning activity intent." into pi-dev am: 8bcbcb230aDaniel Nishi2019-02-011-1/+3
|\| | | | | | | | | |
| * | | | | | | | | | Merge "Fix bug in warning activity intent." into pi-devDaniel Nishi2019-02-011-1/+3
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| | * | | | | | | | | Merge "Fix bug in warning activity intent." into pi-devDaniel Nishi2019-02-011-1/+3
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Fix bug in warning activity intent.Daniel Nishi2019-01-101-1/+3
| | | | |_|_|_|_|/ / / | | | |/| | | | | | |
* | | | | | | | | | | [automerger skipped] Merge "Fix test to use better flag." into pi-dev am: 251...Daniel Nishi2019-02-010-0/+0
|\| | | | | | | | | |
| * | | | | | | | | | Merge "Fix test to use better flag." into pi-devDaniel Nishi2019-02-011-2/+2
| |\| | | | | | | | |
| | * | | | | | | | | Merge "Fix test to use better flag." into pi-devDaniel Nishi2019-02-011-2/+2
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Fix test to use better flag.Daniel Nishi2019-01-111-2/+2
| | | |/ / / / / / / /
* | | | | | | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2019-01-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2019-01-291-1/+1
* | | | | | | | | | | | Remove ignored proguard flags am: b60e935dd2 am: a6429818b9Luca Stefani2019-01-281-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| / / / / / / / / / / | |/ / / / / / / / / /
| * | | | | | | | | | Remove ignored proguard flags am: b60e935dd2Luca Stefani2019-01-281-2/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |