summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge Android 12HEADmasterXin Li2021-10-0615-40/+43
|\
| * default to media ready but show all supported sizes am: 43b7bcd0ccKurtis Schlepp2021-08-191-4/+11
| |\ | |/ |/|
* | default to media ready but show all supported sizesandroid-s-beta-5android-s-beta-5Kurtis Schlepp2021-08-051-4/+11
| * Merge sc-dev-plus-aosp-without-vendor@7634622Xin Li2021-08-1415-41/+44
| |\
| | * [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c45508092...Bill Yi2021-08-070-0/+0
| | |\
| | | * [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c45508092...android12-devBill Yi2021-08-070-0/+0
| | | |\
| | | | * Import translations. DO NOT MERGE ANYWHEREBill Yi2021-08-071-1/+1
| | * | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: afd249f19...Bill Yi2021-08-070-0/+0
| | |\| |
| | | * | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: afd249f19...Bill Yi2021-08-070-0/+0
| | | |\ \
| | | | * | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-08-071-1/+1
| | * | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8e3c317fa...Bill Yi2021-08-070-0/+0
| | |\| | |
| | | * | | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-08-071-1/+1
| | * | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c31eb23c8...Bill Yi2021-07-280-0/+0
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-07-281-1/+1
| | * | | | fix A2 paper size definition am: 3113a3fcc9 am: c06f7d1005Kurtis Schlepp2021-07-220-0/+0
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | fix A2 paper size definition am: 3113a3fcc9Kurtis Schlepp2021-07-221-1/+1
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | fix A2 paper size definitionKurtis Schlepp2021-07-121-1/+1
| | * | | | fix A2 paper size definition am: f60a717f27Kurtis Schlepp2021-07-161-1/+1
| | |\| | |
| | | * | | fix A2 paper size definitionKurtis Schlepp2021-07-161-1/+1
| | * | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: aa0998986...Bill Yi2021-07-060-0/+0
| | |\| | |
| | | * | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: aa0998986...Bill Yi2021-07-060-0/+0
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-07-061-1/+1
| | * | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 196ec7e39...Bill Yi2021-07-060-0/+0
| | |\| | |
| | | * | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 196ec7e39...Bill Yi2021-07-060-0/+0
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-07-061-1/+1
| | * | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 20f8ed768...Bill Yi2021-07-060-0/+0
| | |\| | |
| | | * | | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-07-061-1/+1
| | * | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 62e424fde...Bill Yi2021-07-040-0/+0
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 62e424fde...Bill Yi2021-07-040-0/+0
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Import translations. DO NOT MERGE ANYWHEREandroid-s-beta-4android-s-beta-3android-s-beta-4Bill Yi2021-07-0385-144/+474
| | * | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 22093beaa...Bill Yi2021-07-040-0/+0
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-07-0485-144/+474
| | * | | | Merge "fix crash when printing to pclm supporting printers" am: 66a8da269a am...Erik Wolsheimer2021-07-020-0/+0
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge "fix crash when printing to pclm supporting printers" am: 66a8da269aErik Wolsheimer2021-07-021-3/+2
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge "fix crash when printing to pclm supporting printers"Erik Wolsheimer2021-07-021-3/+2
|\ \ \ \ \ \
| * | | | | | fix crash when printing to pclm supporting printersKurtis Schlepp2021-06-231-3/+2
| | | * | | | Merge "add immutable flag to pending intent" am: e3f401a943 am: eea91c65a3Erik Wolsheimer2021-07-020-0/+0
| | | |\ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge "add immutable flag to pending intent" am: e3f401a943Erik Wolsheimer2021-07-021-1/+1
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | |
* | | | | | | Merge "add immutable flag to pending intent"Erik Wolsheimer2021-07-021-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | add immutable flag to pending intentKurtis Schlepp2021-05-241-1/+1
| | | * | | | fix crash when printing to pclm supporting printers am: 735ca398d1Kurtis Schlepp2021-06-241-3/+2
| | | |\| | |
| | | | * | | fix crash when printing to pclm supporting printersKurtis Schlepp2021-06-241-3/+2
| | | * | | | [automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: 0284dfd077 -s o...Xin Li2021-06-210-0/+0
| | | |\ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | [automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: 0284dfd077 -s oursXin Li2021-06-210-0/+0
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | |
* | | | | | | DO NOT MERGE - Merge RQ3A.210605.005Xin Li2021-06-1885-449/+119
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | | * | | | [automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: 90fae9...Xin Li2021-06-180-0/+0
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | DO NOT MERGE - Mark RQ3A.210410.001 as mergedXin Li2021-06-170-0/+0
| |\ \ \ \ \ \
| | * \ \ \ \ \ Snap for 7252659 from 4e5512602b2ec264ce52568c6751c686dc804a88 to rvc-qpr3-re...android-11.0.0_r46android-11.0.0_r43android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid-build-team Robot2021-04-012-2/+2
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Snap for 7242784 from 57e06651f24227c55b464d59f314eced22bfe842 to rvc-qpr3-re...android-build-team Robot2021-03-291-3/+3
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Snap for 7183002 from bf5d27c229032988d0b77170a1e2c90d18ba3534 to rvc-qpr3-re...android-build-team Robot2021-03-031-1/+1
| | |\ \ \ \ \ \ \ \