summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Snap for 7821744 from 3c077e219fe991bd5f8b17ac70c3a934637cfd53 to sdk-...sdk-releaseAndroid Build Coastguard Worker2021-10-141214-3046/+18727
|\
| * Snap for 7821744 from 3c077e219fe991bd5f8b17ac70c3a934637cfd53 to sdk-releaseAndroid Build Coastguard Worker2021-10-141214-3046/+18727
|/|
| * Merge "Merge Android 12"HEADmasterXin Li2021-10-071214-3046/+18727
| |\
| | * Merge Android 12Xin Li2021-10-061214-3046/+18727
| |/|
| | * [automerger skipped] Merge "Compile CellBroadcastReceiver with module_current...Anton Hansson2021-09-060-0/+0
| | |\ | | |/ | |/|
| | * Compile CellBroadcastReceiver with module_currentAnton Hansson2021-09-022-7/+11
| | * Merge sc-dev-plus-aosp-without-vendor@7634622Xin Li2021-08-14970-2411/+13388
| | |\
| | | * [automerger skipped] Merge "Update telephony OWNERS file" am: 3ae814f3e1 am: ...Jayachandran Chinnakkannu2021-08-060-0/+0
| | | |\ | | | |/ | | |/|
| | * | Merge "Update telephony OWNERS file" am: 3ae814f3e1Jayachandran Chinnakkannu2021-08-061-3/+4
| | |\ \
| | | | * Version bump for CellBroadcast am: 884176f052Anton Hansson2021-08-061-1/+1
| | | | |\
| | | | | * Version bump for CellBroadcastandroid12-devAnton Hansson2021-08-051-1/+1
| | | | * | Update telephony OWNERS file am: dc36848d87Jayachandran C2021-08-041-3/+4
| | | | |\|
| | | | | * Update telephony OWNERS fileJayachandran C2021-08-031-3/+4
| | | | * | Merge "KR public safety toggle part 3" into sc-dev am: 0960963300TreeHugger Robot2021-07-301-4/+3
| | | | |\|
| | | | | * Merge "KR public safety toggle part 3" into sc-devTreeHugger Robot2021-07-301-4/+3
| | | | | |\
| | | | | | * KR public safety toggle part 3Chen Xu2021-07-291-4/+3
| | | | * | | [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ...TreeHugger Robot2021-07-300-0/+0
| | | | |\| |
| | | | | * | Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-devTreeHugger Robot2021-07-3084-0/+2856
| | | | | |\ \
| | | | | | * | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-07-3084-0/+2856
| | | | * | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71884e138...Bill Yi2021-07-300-0/+0
| | | | |\| | |
| | | | | * | | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-07-3084-0/+336
| | | | | |/ /
| | | | * | | [automerger skipped] FCC change Presidential alert label to “National alert...Chen Xu2021-07-290-0/+0
| | | | |\| |
| | | | | * | FCC change Presidential alert label to “National alert”Chen Xu2021-07-291-0/+5
| | | | | |/
| | | | * | Merge "correct cbr dialog timestamp format for Chile" into sc-dev am: ef55ee1571Chen Xu2021-07-291-1/+1
| | | | |\|
| | | | | * Merge "correct cbr dialog timestamp format for Chile" into sc-devChen Xu2021-07-291-1/+1
| | | | | |\
| | | | | | * correct cbr dialog timestamp format for ChileChen Xu2021-07-291-1/+1
| | | | * | | Merge "FCC change Presidential alert label to “National alert”" into sc-d...TreeHugger Robot2021-07-290-0/+0
| | | | |\| |
| | | | | * | Merge "FCC change Presidential alert label to “National alert”" into sc-devTreeHugger Robot2021-07-290-0/+0
| | | | | |\ \
| | | | | | * | FCC change Presidential alert label to “National alert”Chen Xu2021-07-290-0/+0
| | | | | | |/
| | | | * | | Merge "provide alram on/off function of public safety messages for KR" into s...TreeHugger Robot2021-07-291-2/+2
| | | | |\| |
| | | | | * | Merge "provide alram on/off function of public safety messages for KR" into s...TreeHugger Robot2021-07-291-2/+2
| | | | | |\ \ | | | | | | |/ | | | | | |/|
| | | | | | * provide alram on/off function of public safety messages for KRChen Xu2021-07-281-2/+2
| | | | * | | Merge "FCC change Presidential alert label to “National alert”" into sc-d...TreeHugger Robot2021-07-291-0/+5
| | | | |\| |
| | | | | * | Merge "FCC change Presidential alert label to “National alert”" into sc-devTreeHugger Robot2021-07-291-0/+5
| | | | | |\ \
| | | | | | * | FCC change Presidential alert label to “National alert”Chen Xu2021-07-281-0/+5
| | | | | | |/
| | | | * | | Merge "support Turkey emergency alert" into sc-dev am: 76bf59c5e9TreeHugger Robot2021-07-282-10/+68
| | | | |\| |
| | | | | * | Merge "support Turkey emergency alert" into sc-devTreeHugger Robot2021-07-282-10/+68
| | | | | |\ \
| | | | | | * | support Turkey emergency alertChen Xu2021-07-282-10/+68
| | | | | | |/
| | | | * | | Merge "support Ecuador emergency alert" into sc-dev am: b565605df5TreeHugger Robot2021-07-2811-53/+94
| | | | |\| |
| | | | | * | Merge "support Ecuador emergency alert" into sc-devTreeHugger Robot2021-07-2811-53/+94
| | | | | |\ \
| | | | | | * | support Ecuador emergency alertChen Xu2021-07-2811-53/+94
| | | | | | |/
| | | | * | | Merge "Update config for CA" into sc-dev am: fcc19eaa93TreeHugger Robot2021-07-281-0/+8
| | | | |\| |
| | | | | * | Merge "Update config for CA" into sc-devTreeHugger Robot2021-07-281-0/+8
| | | | | |\ \
| | | | | | * | Update config for CAJordan Liu2021-07-281-0/+8
| | | | | | |/
| | | | * | | keep default settings on for Telstra am: 6521b318baChen Xu2021-07-284-104/+0
| | | | |\| |
| | | | | * | keep default settings on for TelstraChen Xu2021-07-284-104/+0
| | | | | |/
| | | | * | use customize layout in CollapsingToolbarBaseActivity for R SDK am: 3f2e446f80Chen Xu2021-07-267-2/+180
| | | | |\|
| | | | | * use customize layout in CollapsingToolbarBaseActivity for R SDKChen Xu2021-07-267-2/+180
| | | | * | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51c702668...Bill Yi2021-07-240-0/+0
| | | | |\|
| | | | | * [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51c702668...Bill Yi2021-07-240-0/+0
| | | | | |\