summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-10.0.0_r37' into staging/lineage-17.1_merge-android-10.0.0...lineage-17.1Kevin F. Haggerty2020-06-0229-201/+88
|\
| * Snap for 6320329 from 42838e2ee7b30538fd43bbf530b108ef03a59a82 to qt-qpr3-rel...android-build-team Robot2020-03-2120-45/+45
| |\
| | * Import translations. DO NOT MERGEBill Yi2020-03-2020-45/+45
| * | Snap for 6300693 from e861749b6537943ed0197dc712f8a8722baf0cac to qt-qpr3-rel...android-build-team Robot2020-03-169-152/+39
| |\ \ | | |/
| | * DO NOT MERGE: Chassify PermissionControllerCole Faust2020-03-139-152/+39
| * | Snap for 6131975 from d08040fabe25bd81db1100c578b98bf03884a1a0 to qt-qpr3-rel...android-build-team Robot2020-01-143-4/+4
| |\ \ | | |/
| | * Import translations. DO NOT MERGEBill Yi2020-01-133-4/+4
| |/
* | Automatic translation importMichael Bestas2020-04-231-1/+309
* | Merge tag 'android-10.0.0_r31' into lineage-17.1-android-10.0.0_r31Luca Stefani2020-03-07263-24438/+24474
|\ \
| * \ Merge cherrypicks of [10101230, 10101593, 10101594, 10101595, 10101362, 10101...android-build-team Robot2020-01-161-1/+1
| |\ \
| | * | Revert "DO NOT MERGE Set module versions to 299900000 Dev branch..."Akshay Thakker2020-01-161-1/+1
| |/ /
| * | Snap for 6095135 from 3a9807f25f579ff097280e7c1ae390e9ebed5a18 to qt-qpr2-rel...android-build-team Robot2019-12-243-3/+3
| |\ \ | | |/
| | * Import translations. DO NOT MERGEBill Yi2019-12-223-3/+3
| * | Snap for 6091187 from b65c7fa0d652407c06945d6c1d3ea50a39fad483 to qt-qpr2-rel...android-build-team Robot2019-12-212-21/+8
| |\ \ | | |/
| | * Remove permission usage from settings searchNate Myren2019-12-192-21/+8
| * | Snap for 6047316 from 5538e7c238c7f66c9b379d218f71afeb20fe1f08 to qt-qpr2-rel...android-build-team Robot2019-12-041-2/+2
| |\ \ | | |/
| | * Import translations. DO NOT MERGEBill Yi2019-12-031-2/+2
| * | Snap for 6034952 from db202f80676042b5558cd22dbd1e1a52fd33c9c1 to qt-qpr2-rel...android-build-team Robot2019-11-27255-24416/+24416
| |\ \ | | |/
| | * Import translations. DO NOT MERGEBill Yi2019-11-25255-24416/+24416
| * | Snap for 5999326 from d7fe1125c647a4df66ba69196600ec12c08090e9 to qt-qpr2-rel...android-build-team Robot2019-11-1140-82/+82
| |\ \ | | |/
| | * Import translations. DO NOT MERGEBill Yi2019-11-1040-82/+82
| * | Snap for 5998981 from 3ffb677244a3b6770845076b6a1badd228090efe to qt-qpr2-rel...android-build-team Robot2019-11-101-1/+1
| |\ \ | | |/
| | * Merge "DO NOT MERGE Set module versions to 299900000 Dev branch modules need ...Akshay Thakker2019-11-071-1/+1
| | |\
| | | * DO NOT MERGE Set module versions to 299900000Akshay2019-10-281-1/+1
| * | | Snap for 5991964 from c7f9ea7fde9b891a4135fa8e54f06f417d7d732f to qt-qpr2-rel...android-build-team Robot2019-11-070-0/+0
| |\ \ \ | | |/ /
| | * | [automerger skipped] Always copy file before parsing it for installing am: ce...Philip P. Moltmann2019-11-060-0/+0
| | |\ \ | | | |/ | | |/|
| | | * [automerger skipped] Always copy file before parsing it for installing am: ce...Philip P. Moltmann2019-11-060-0/+0
| | | |\
| | | | * [automerger skipped] Always copy file before parsing it for installing am: ce...Philip P. Moltmann2019-11-060-0/+0
| | | | |\
| | | | | * [automerger skipped] Always copy file before parsing it for installing am: ce...Philip P. Moltmann2019-11-060-0/+0
| | | | | |\
| | | | | | * [automerger skipped] Always copy file before parsing it for installing am: ce...Philip P. Moltmann2019-11-060-0/+0
| | | | | | |\
| | | | | | | * Always copy file before parsing it for installingPhilip P. Moltmann2019-11-062-16/+13
| | | | | | | |\
| | | | | | | | * Always copy file before parsing it for installingPhilip P. Moltmann2019-11-062-16/+13
| * | | | | | | | Snap for 5968679 from ea47782c915259d5ea0aa9063ce67d3a5439b891 to qt-qpr2-rel...android-build-team Robot2019-10-265-3/+50
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | [DO NOT MERGE] Grant all access_media_location permission am: 1a633927ddPhilip P. Moltmann2019-10-250-0/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | [DO NOT MERGE] Grant all access_media_location permissionPhilip P. Moltmann2019-10-251-2/+42
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | [DO NOT MERGE] Grant all access_media_location permissionPhilip P. Moltmann2019-10-241-2/+42
| | * | | | | | | Merge "Keep "None" set for assistant upon device upgrade." into qt-qpr1-devTreeHugger Robot2019-10-244-0/+40
| | |\ \ \ \ \ \ \
| | | * | | | | | | Keep "None" set for assistant upon device upgrade.Hai Zhang2019-10-014-0/+40
| | * | | | | | | | Merge "Fix crash when role data isn't loaded after restoring state." into qt-...TreeHugger Robot2019-10-241-3/+10
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fix crash when role data isn't loaded after restoring state.Hai Zhang2019-10-011-3/+10
| | | |/ / / / / / /
| * | | | | | | | | Snap for 5922641 from ab2e1ec8e5eac06f3288d57a9591a609cd0ece8e to qt-qpr2-rel...android-build-team Robot2019-10-052-6/+63
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "Update PermissionChecker usages to avoid unnecessary attribution." int...Philip P. Moltmann2019-10-042-6/+63
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Merge "Update PermissionChecker usages to avoid unnecessary attribution." int...Philip P. Moltmann2019-10-042-6/+63
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | |
| | | | * | | | | | Merge "Update PermissionChecker usages to avoid unnecessary attribution." int...Philip P. Moltmann2019-10-042-6/+63
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Update PermissionChecker usages to avoid unnecessary attribution.Svet Ganov2019-10-032-6/+63
| * | | | | | | | | | Snap for 5919859 from a5075bbd58961399b6e39128d8f13481441512ae to qt-qpr2-rel...android-build-team Robot2019-10-041-0/+2
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | / / / / / | | |_|_|_|/ / / / / | |/| | | | | | | |
| | * | | | | | | | Merge "add java_api_finder plugin to mainline module PermissionController to ...Kun Niu2019-10-031-0/+2
| | |\ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | _ / / / / / / | | | / / / / / /
| | * | | | | | | Merge "add java_api_finder plugin to mainline module PermissionController to ...Kun Niu2019-10-031-0/+2
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge "add java_api_finder plugin to mainline module PermissionController to ...TreeHugger Robot2019-10-031-0/+2
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | add java_api_finder plugin to mainline module PermissionController to generat...Kun Niu2019-10-011-0/+2