summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Snap for 5061196 from 18813e9911b594ab210347756b53f85fe781fc52 to mast...master-cuttlefish-testing-releaseandroid-build-prod (mdb)2018-10-121-1/+1
|\
| * Snap for 5061196 from 18813e9911b594ab210347756b53f85fe781fc52 to master-cutt...android-build-prod (mdb)2018-10-121-1/+1
|/|
| * Merge "Moved channel 919 to emergency channel"Treehugger Robot2018-10-101-1/+1
|/|
| * Moved channel 919 to emergency channelJack Yu2018-10-091-1/+1
|/
* Merge "Support partial of the United Arab Emirates requirement"Treehugger Robot2018-10-042-0/+51
|\
| * Support partial of the United Arab Emirates requirementJack Yu2018-10-042-0/+51
* | Merge changes from topic "fcc_2019"android-o-mr1-iot-release-1.0.5Jack Yu2018-10-0319-17/+261
|\ \ | |/ |/|
| * Added state/local test alert supportJack Yu2018-10-0213-9/+129
| * Added language filter support and enabled it for the USJack Yu2018-10-029-154/+108
| * Enabled public safety messages support for USJack Yu2018-10-028-0/+170
|/
* Merge "Fixed the emergency alert strings for Peru"Treehugger Robot2018-10-011-0/+4
|\
| * Fixed the emergency alert strings for PeruJack Yu2018-09-281-0/+4
|/
* Merge "New Zealand CBR requirements"Treehugger Robot2018-09-242-0/+41
|\
| * New Zealand CBR requirementsArun Rathi2018-09-242-0/+41
|/
* Merge "Additional fix for Peru emergency alert support"Treehugger Robot2018-09-084-69/+3
|\
| * Additional fix for Peru emergency alert supportArun Rathi2018-08-304-69/+3
* | Merge "Update Extreme alerts title for Bell Canada"Treehugger Robot2018-09-081-0/+2
|\ \
| * | Update Extreme alerts title for Bell CanadaJawahar Venugopal2018-09-031-0/+2
|/ /
* | Merge "Migrate CellBroadcastReceiver"android-o-mr1-iot-release-1.0.4Treehugger Robot2018-08-293-14/+14
|\ \ | |/ |/|
| * Migrate CellBroadcastReceiverAurimas Liutikas2018-08-283-14/+14
|/
* Merge "Correct the emergency alert support for Peru"Treehugger Robot2018-08-231-1/+1
|\
| * Correct the emergency alert support for PeruArun Rathi2018-08-231-1/+1
|/
* Merge "Fix resource warnings."Youming Ye2018-08-101-2/+2
|\
| * Fix resource warnings.Youming Ye2018-08-101-2/+2
|/
* Merge "Fixed emergency alerts for carriers"Jack Yu2018-08-083-9/+15
|\
| * Fixed emergency alerts for carriersJack Yu2018-08-083-9/+15
|/
* Merge "Merge Android Pie into master"android-o-mr1-iot-release-1.0.3Xin Li2018-08-07413-4595/+6804
|\
| * Merge Android Pie into masterXin Li2018-08-06413-4595/+6804
|/|
| * Import translations. DO NOT MERGEBill Yi2018-08-04242-273/+3713
| * Merge "Add Channel 50 (area update info) support for LAM market"Arun Rathi2018-07-1111-0/+242
| |\ | |/ |/|
* | Merge "Add Channel 50 (area update info) support for LAM market"android-p-preview-5android-n-iot-release-smart-display-r2Treehugger Robot2018-07-1111-0/+242
|\ \
| * | Add Channel 50 (area update info) support for LAM marketArun Rathi2018-07-1111-0/+242
|/ /
| * Merge "Fixed flaky tests"Jack Yu2018-06-191-3/+3
| |\ | |/ |/|
* | Merge "Fixed flaky tests"android-p-preview-4android-o-mr1-iot-release-1.0.2android-n-iot-release-smart-displayJack Yu2018-06-191-3/+3
|\ \
| * | Fixed flaky testsJack Yu2018-06-191-3/+3
|/ /
| * Merge "Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master" into sta...Xin Li2018-06-08253-4391/+3160
| |\
| | * Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li2018-06-08253-4391/+3160
| | |\
| | | * [automerger skipped] Merge "Hide CMAS settings for Chilean users" am: 50a5592029Jack Yu2018-05-240-0/+0
| | | |\ | | | |/ | | |/|
| | | * [automerger skipped] Merge "Enabled channels for KDDI" am: d69caa2773Jack Yu2018-05-240-0/+0
| | | |\
| | | * \ [automerger skipped] Import translations. DO NOT MERGEBill Yi2018-05-200-0/+0
| | | |\ \
| | | | * | Import translations. DO NOT MERGEpie-devBill Yi2018-05-201-1/+1
| | | * | | Merge "Hide CMAS settings for Chilean users" into pi-devJack Yu2018-05-151-0/+4
| | | |\| |
| | | | * | Merge "Hide CMAS settings for Chilean users" into pi-devJack Yu2018-05-151-0/+4
| | | | |\ \
| | | | | * | Hide CMAS settings for Chilean usersJack Yu2018-05-141-0/+4
| | | * | | | [automerger skipped] Merge "Fixed that TTS and alert tone are in different au...Jack Yu2018-05-140-0/+0
| | | |\ \ \ \
| | | * \ \ \ \ Merge "Fixed that TTS and alert tone are in different audio channels" into pi...Jack Yu2018-05-141-2/+3
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | * | | | Merge "Fixed that TTS and alert tone are in different audio channels" into pi...TreeHugger Robot2018-05-141-2/+3
| | | | |\ \ \ \
| | | | | * | | | Fixed that TTS and alert tone are in different audio channelsJack Yu2018-05-111-2/+3
| | | | | | |/ / | | | | | |/| |
| | | * | | | | Merge "Enabled channels for KDDI" into pi-devJack Yu2018-05-113-3/+6
| | | |\| | | |
| | | | * | | | Merge "Enabled channels for KDDI" into pi-devTreeHugger Robot2018-05-113-3/+6
| | | | |\ \ \ \