summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Multiple fixes to CMAS app.Jake Hamby2012-10-1219-295/+654
* 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
* | | | | am 7d709256: am bf70b6f8: Fix behavior of CMAS audio alert and vibration.Jake Hamby2012-08-276-47/+141
|\| | | |
| * | | | am bf70b6f8: Fix behavior of CMAS audio alert and vibration.Jake Hamby2012-08-276-47/+141
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Fix behavior of CMAS audio alert and vibration.Jake Hamby2012-08-276-47/+141
* | | | | am c945c451: am a93243d1: Add "View details" context menu to CMAS alert list ...Jake Hamby2012-08-275-74/+104
|\| | | |
| * | | | am a93243d1: Add "View details" context menu to CMAS alert list view.Jake Hamby2012-08-275-74/+104
| |\| | |
| | * | | Add "View details" context menu to CMAS alert list view.Jake Hamby2012-08-245-74/+104
* | | | | am 500f2c65: am b6e1c8ac: Merge "CellBroadcastReceiver: Use ICS alert drawable"Jean-Baptiste Queru2012-08-131-1/+1
|\| | | |
| * | | | am b6e1c8ac: Merge "CellBroadcastReceiver: Use ICS alert drawable"Jean-Baptiste Queru2012-08-131-1/+1
| |\ \ \ \
| | * \ \ \ Merge "CellBroadcastReceiver: Use ICS alert drawable"Jean-Baptiste Queru2012-08-131-1/+1
| | |\ \ \ \
| | | * | | | CellBroadcastReceiver: Use ICS alert drawableBjörn Lundén2012-08-131-1/+1
| | |/ / / /
* | | | | | am 99069204: (-s ours) Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-08-070-0/+0
|\| | | | |
| * | | | | Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-08-070-0/+0
| |\ \ \ \ \
| | * \ \ \ \ merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-08-070-0/+0
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
* | | | | | | am a02188f0: (-s ours) Reconcile with jb-release - do not mergeThe Android Open Source Project2012-08-060-0/+0
|\| | | | | |
| * | | | | | Reconcile with jb-release - do not mergeThe Android Open Source Project2012-08-060-0/+0
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Add message ID cache to detect duplicate broadcasts.Jake Hamby2012-08-061-0/+47
* | | | | | | am 34d4c509: am d716ca0c: Add message ID cache to detect duplicate broadcasts.Jake Hamby2012-08-051-0/+47
|\| | | | | |