summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* CB: NL translationscm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1Marco Brohet2013-04-201-6/+6
* Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/pac...cm-10.1-M3cm-10.1-M2mr1.1-stagingSteve Kondik2013-02-1258-77/+308
|\
| * Import translations. DO NOT MERGEBaligh Uddin2012-12-121-1/+1
| * Import translations. DO NOT MERGEBaligh Uddin2012-12-1047-94/+47
| * Import translations. DO NOT MERGEBaligh Uddin2012-12-0548-0/+96
| * Enable support for area info cell broadcasts in Brazil.Jake Hamby2012-12-0410-76/+230
| * Delay cell broadcast config until modem is ready to handle.Jake Hamby2012-11-291-1/+29
* | CellBroadcastReceiver: remove values-nl array.xml derpcm-10.1-M1Rick C2012-12-031-26/+0
* | Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/pa...Steve Kondik2012-11-18120-1103/+2031
|\|
| * Import translations. DO NOT MERGEBaligh Uddin2012-10-243-4/+4
| * Update CMAS duplicate message detection for carrier requirement.Jake Hamby2012-10-232-51/+38
| * Import translations. DO NOT MERGEBaligh Uddin2012-10-233-5/+5
| * Import translations. DO NOT MERGEBaligh Uddin2012-10-2290-581/+293
| * Import translations. DO NOT MERGEBaligh Uddin2012-10-1710-60/+30
| * Import translations. DO NOT MERGEBaligh Uddin2012-10-1696-0/+576
| * Merge "Multiple fixes to CMAS app." into jb-mr1-devJake Hamby2012-10-1519-295/+654
| |\
| | * Multiple fixes to CMAS app.Jake Hamby2012-10-1219-295/+654
| * | Let's enhanceJason Chen2012-10-121-0/+0
| |/
| * am f1f044dc: (-s ours) Reconcile with jb-release - do not mergeThe Android Open Source Project2012-10-020-0/+0
| |\
| | * Reconcile with jb-release - do not mergeThe Android Open Source Project2012-10-020-0/+0
| | |\
| | | * Fix ETWS earthquake alert to vibrate when in silent mode.Jake Hamby2012-09-283-16/+31
| * | | Clean up Global settings stragglers.Jeff Sharkey2012-09-261-2/+2
| * | | am 97260743: (-s ours) am 60425df1: Import translations. DO NOT MERGEBaligh Uddin2012-09-130-0/+0
| |\| |
| | * | am 60425df1: Import translations. DO NOT MERGEBaligh Uddin2012-09-131-1/+1
| | |\ \
| | | * | Import translations. DO NOT MERGEBaligh Uddin2012-09-131-1/+1
| * | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-131-1/+1
| * | | | am 8f8925e4: am 68dc486f: Fix ETWS earthquake alert to vibrate when in silent...Jake Hamby2012-09-103-16/+31
| |\| | |
| | * | | am 68dc486f: Fix ETWS earthquake alert to vibrate when in silent mode.Jake Hamby2012-09-103-16/+31
| | |\| |
| | | * | Fix ETWS earthquake alert to vibrate when in silent mode.Jake Hamby2012-09-103-16/+31
| * | | | am 4e6bda50: (-s ours) am e397957b: Import translations. DO NOT MERGEBaligh Uddin2012-09-060-0/+0
| |\| | |
| | * | | am e397957b: Import translations. DO NOT MERGEBaligh Uddin2012-09-0614-19/+19
| | |\| |
| | | * | Import translations. DO NOT MERGEBaligh Uddin2012-09-0514-19/+19
| * | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-09-0614-19/+19
| |\ \ \ \
| | * | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-0514-19/+19
| * | | | | am a0960454: (-s ours) Reconcile with jb-release - do not mergeThe Android Open Source Project2012-09-060-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | Reconcile with jb-release - do not mergeThe Android Open Source Project2012-09-060-0/+0
| | |\ \ \ | | | | |/ | | | |/|
| | | * | merge in jb-release history after reset to jb-devThe Android Automerger2012-08-290-0/+0
| | | |\ \
| | | | * \ merge in jb-release history after reset to jb-devThe Android Automerger2012-08-290-0/+0
| | | | |\ \ | | | | |/ / | | | |/| |
| * | | | | am c48f31d8: (-s ours) am a0a3a5e1: Import translations. DO NOT MERGEBaligh Uddin2012-09-040-0/+0
| |\| | | |
| | * | | | am a0a3a5e1: Import translations. DO NOT MERGEBaligh Uddin2012-09-0430-871/+436
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Import translations. DO NOT MERGEBaligh Uddin2012-08-3130-871/+436
| * | | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-3130-871/+436
| * | | | | am 7d39e558: (-s ours) am 12ec2fe4: Import translations. DO NOT MERGEBaligh Uddin2012-08-300-0/+0
| |\| | | |
| | * | | | am 12ec2fe4: Import translations. DO NOT MERGEBaligh Uddin2012-08-3048-547/+1204
| | |\| | |
| | | * | | Import translations. DO NOT MERGEBaligh Uddin2012-08-2948-547/+1204
| * | | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-2948-534/+1191
| * | | | | am adccaaa0: (-s ours) Reconcile with jb-release - do not mergeThe Android Open Source Project2012-08-270-0/+0
| |\| | | |
| | * | | | Reconcile with jb-release - do not mergeThe Android Open Source Project2012-08-270-0/+0
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Fix behavior of CMAS audio alert and vibration.Jake Hamby2012-08-276-47/+141
| | | * | | Add "View details" context menu to CMAS alert list view.Jake Hamby2012-08-275-74/+104