summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Import translations. DO NOT MERGEandroid10-devBill Yi2019-06-233-3/+3
* Confirm user credentials _only_ for CA certificateEran Messeri2019-06-051-2/+7
* Confirm user credentials before installing CA.Pavel Grafov2019-05-302-106/+89
* Import translations. DO NOT MERGEBill Yi2019-05-251-4/+4
* Import translations. DO NOT MERGEBill Yi2019-05-041-1/+1
* Import translations. DO NOT MERGEBill Yi2019-04-251-2/+1
* Import translations. DO NOT MERGEBill Yi2019-04-176-9/+6
* Import translations. DO NOT MERGEBill Yi2019-04-0884-30/+89
* Merge master@5406228 into git_qt-dev-plus-aosp.Bill Rassieur2019-04-030-0/+0
|\
| * Merge master@5406228 into git_qt-dev-plus-aosp.Bill Rassieur2019-03-2915-0/+30
| |\ | |/ |/|
* | Import translations. DO NOT MERGEBill Yi2019-03-2315-0/+30
|/
* [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"...Xin Li2019-03-110-0/+0
|\
| * [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"...Xin Li2019-03-110-0/+0
| |\
| | * [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"Xin Li2019-03-110-0/+0
| | |\
| | | * Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.10Treehugger Robot2019-03-110-0/+0
| | | |\
* | | | | [automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: 875...Xin Li2019-03-110-0/+0
|\| | | |
| * | | | [automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: 875...Xin Li2019-03-110-0/+0
| |\| | |
| | * | | [automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into masterXin Li2019-03-110-0/+0
| | |\ \ \ | | | | |/ | | | |/|
| | | * | DO NOT MERGE - Merge PPRL.190305.001 into masterXin Li2019-03-110-0/+0
| | | |\ \ | | | | |/ | | | |/|
* | | | | Fix key algorithm serializationEran Messeri2019-03-072-5/+14
* | | | | Import translations. DO NOT MERGEBill Yi2019-03-021-1/+1
* | | | | Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
|\| | | |
| * | | | Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
| |\| | |
| | * | | DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-2181-103/+22
| | |\ \ \
* | | | | | [automerger skipped] Import translations. DO NOT MERGE am: d1772b041a -s oursBill Yi2019-02-210-0/+0
|\| | | | |
| * | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2019-02-210-0/+0
| |\ \ \ \ \
| | * | | | | Import translations. DO NOT MERGEBill Yi2019-02-203-60/+60
* | | | | | | [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.00...Xin Li2019-02-110-0/+0
|\| | | | | |
| * | | | | | [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.00...Xin Li2019-02-110-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-ma...Xin Li2019-02-110-0/+0
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Snap for 5180536 from 1f81bc85ba6733b0c72980aeab301de5b382b97e to pi-platform...android-build-team Robot2019-02-092-4/+4
| | | |\ \ \ \
| | | | * \ \ \ Snap for 5130385 from c78fc83e718dff47b64e33577cc6de042ce23bba 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-140-0/+0
| | | | |\ \ \ \
| | | | * \ \ \ \ Snap for 5073521 from 02bd7c156e3a0e27623b2d978501784f095fa1f9 to pi-qpr2-rel...android-build-team Robot2018-10-172-4/+4
| | | | |\ \ \ \ \
* | | | | | | | | | Fix manual CA certificate installation flowEran Messeri2019-02-061-2/+11
* | | | | | | | | | Import translations. DO NOT MERGEBill Yi2019-02-021-55/+55
* | | | | | | | | | Import translations. DO NOT MERGEBill Yi2019-01-292-3/+3
* | | | | | | | | | Remove Wear special-case handlingEran Messeri2019-01-241-11/+2
* | | | | | | | | | Merge "KeyChain: Remove screenlock requirement"TreeHugger Robot2019-01-221-49/+24
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | KeyChain: Remove screenlock requirementEran Messeri2019-01-171-49/+24
* | | | | | | | | | | Merge "Add OWNERS for CertInstaller" am: a1cff8bccd am: d291ea3923Eran Messeri2019-01-211-0/+5
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| / / / / / / / / / | |/ / / / / / / / /
| * | | | | | | / / Merge "Add OWNERS for CertInstaller" am: a1cff8bccdEran Messeri2019-01-211-0/+5
| |\| | | | | | | | | | |_|_|_|_|_|/ / | |/| | | | | | |
| | * | | | | | | Merge "Add OWNERS for CertInstaller"Eran Messeri2019-01-211-0/+5
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | Merge "Add OWNERS for CertInstaller"Treehugger Robot2019-01-211-0/+5
| | | |\ \ \ \ \ \
| | | | * | | | | | Add OWNERS for CertInstallerEran Messeri2019-01-211-0/+5
| | | |/ / / / / /
* | | | | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2019-01-121-6/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Import translations. DO NOT MERGEBill Yi2019-01-121-6/+6
* | | | | | | | | | Merge "Convert Android.mk file to Android.bp" am: 633b674596 am: 5f6905b4c3Sasha Smundak2019-01-112-15/+6
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| / / / / / / / / | |/ / / / / / / /
| * | | | | | | | Merge "Convert Android.mk file to Android.bp" am: 633b674596Sasha Smundak2019-01-112-15/+6
| |\| | | | | | |
| | * | | | | | | Merge "Convert Android.mk file to Android.bp"Sasha Smundak2019-01-112-15/+6
| | |\| | | | | |
| | | * | | | | | Merge "Convert Android.mk file to Android.bp"Treehugger Robot2019-01-122-15/+6
| | | |\ \ \ \ \ \