summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Snap for 6132310 from ddb76f816d71abc7093b9e1f6d772f80a36b1e3c to qt-d4-releaseandroid-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android10-d4-s1-releaseandroid10-d4-releaseandroid-build-team Robot2020-01-141-1/+1
|\
| * Import translations. DO NOT MERGEBill Yi2020-01-121-1/+1
* | Snap for 6053067 from 3a9165c0c9ca6862020112df091d5bec7e13654a to qt-d4-releaseandroid-build-team Robot2019-12-060-0/+0
|\|
| * [automerger skipped] KeyChain: Do not allow hiding Cert Install dialog am: 6a...android-mainline-10.0.0_r9Automerger Merge Worker2019-12-050-0/+0
| |\
| | * [automerger skipped] KeyChain: Do not allow hiding Cert Install dialog am: 6a...Automerger Merge Worker2019-12-050-0/+0
| | |\
| | | * [automerger skipped] KeyChain: Do not allow hiding Cert Install dialog am: 6a...Automerger Merge Worker2019-12-050-0/+0
| | | |\
| | | | * KeyChain: Do not allow hiding Cert Install dialog am: 6afaf1846c am: 3c88a6e6...Automerger Merge Worker2019-12-052-0/+4
| | | | |\
| | | | | * KeyChain: Do not allow hiding Cert Install dialog am: 6afaf1846c am: 3c88a6e60fAutomerger Merge Worker2019-12-052-0/+4
| | | | | |\
| | | | | | * KeyChain: Do not allow hiding Cert Install dialog am: 6afaf1846cAutomerger Merge Worker2019-12-052-0/+4
| | | | | | |\
| | | | | | | * KeyChain: Do not allow hiding Cert Install dialogEran Messeri2019-12-042-0/+4
* | | | | | | | Snap for 6050436 from 83b9e9fa5c3440d55d5ac60e5b908d7cc36c6597 to qt-d4-releaseandroid-build-team Robot2019-12-052-0/+4
|\| | | | | | |
| * | | | | | | KeyChain: Do not allow hiding Cert Install dialog am: afdacb2ec4 am: 2151a76f90Automerger Merge Worker2019-12-042-0/+4
| |\| | | | | |
| | * | | | | | KeyChain: Do not allow hiding Cert Install dialog am: afdacb2ec4Automerger Merge Worker2019-12-042-0/+4
| | |\| | | | |
| | | * | | | | KeyChain: Do not allow hiding Cert Install dialogEran Messeri2019-11-062-0/+4
* | | | | | | | Snap for 5970985 from 2ee5e6b596930be29344540d91e79cd7e9ab9a09 to qt-d4-releaseandroid-build-team Robot2019-10-281-1/+1
|\| | | | | | |
| * | | | | | | Import translations. DO NOT MERGEBill Yi2019-09-271-1/+1
|/ / / / / / /
* / / / / / / Move install component into config file.davidln2019-09-043-4/+5
|/ / / / / /
* | | | | | Merge "Import translations. DO NOT MERGE" into qt-r1-devBill Yi2019-07-151-1/+1
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBill Yi2019-07-141-1/+1
* | | | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2019-07-140-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | Import translations. DO NOT MERGEBill Yi2019-07-141-1/+1
* | | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2019-06-240-0/+0
|\| | | | |
| * | | | | Import translations. DO NOT MERGEandroid10-devBill Yi2019-06-233-3/+3
* | | | | | Import translations. DO NOT MERGEBill Yi2019-06-193-7/+7
* | | | | | Confirm user credentials _only_ for CA certificateEran Messeri2019-06-051-2/+7
|\| | | | |
| * | | | | Confirm user credentials _only_ for CA certificateEran Messeri2019-06-051-2/+7
* | | | | | Confirm user credentials before installing CA.Pavel Grafov2019-05-312-106/+89
|\| | | | |
| * | | | | Confirm user credentials before installing CA.Pavel Grafov2019-05-302-106/+89
* | | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2019-05-250-0/+0
|\| | | | |
| * | | | | 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
| | |\ \ \ \ \ \ \