summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 2f76aaaf: Merge "Enable EAP-pwd configuration in WiFi Settings."Irfan Sheriff2012-03-013-6/+39
|\
| * Merge "Enable EAP-pwd configuration in WiFi Settings."Irfan Sheriff2012-03-013-6/+39
| |\
| | * Enable EAP-pwd configuration in WiFi Settings.Partha N2012-02-263-6/+39
* | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-03-010-0/+0
|\ \ \
| * \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-02-280-0/+0
| |\ \ \
* | | | | am 93724840: Don\'t crash if there\'s no bluetooth functionality (such as in ...Amith Yamasani2012-02-282-4/+13
|\| | | |
| * | | | Don't crash if there's no bluetooth functionality (such as in an emulator) do...Amith Yamasani2012-02-282-4/+13
* | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-160-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-02-140-0/+0
| |\ \ \ \ | | |/ / / | |/| | |
* | | | | am 78ef5443: Import translations. DO NOT MERGEEric Fischer2012-02-1013-49/+49
|\| | | |
| * | | | Import translations. DO NOT MERGEEric Fischer2012-02-0813-49/+49
* | | | | am 67a50f99: Import translations. DO NOT MERGEEric Fischer2012-02-0249-676/+973
|\| | | |
| * | | | Import translations. DO NOT MERGEEric Fischer2012-02-0249-676/+973
* | | | | am b6e57c1f: Merge "Do not set minimum value for mobile data limit dialog hig...Jean-Baptiste Queru2012-01-271-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge "Do not set minimum value for mobile data limit dialog higher than the ...Jean-Baptiste Queru2012-01-271-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Do not set minimum value for mobile data limit dialog higher than the actual ...Shuhrat Dehkanov2012-01-261-1/+1
| |/ / /
* | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-230-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-200-0/+0
| |\ \ \ | | |_|/ | |/| |
* | | | am 43c9dcc1: Merge "Fix a pseudo race condition in TtsEngineSettingsFragment....Justin Ho2012-01-201-1/+10
|\| | |
| * | | Merge "Fix a pseudo race condition in TtsEngineSettingsFragment." into ics-mr1Justin Ho2012-01-201-1/+10
| |\ \ \
| | * | | Fix a pseudo race condition in TtsEngineSettingsFragment.Narayan Kamath2012-01-201-1/+10
* | | | | am 999f23e2: Locale string comparisons must ignore case.Narayan Kamath2012-01-201-1/+1
|\| | | |
| * | | | Locale string comparisons must ignore case.Narayan Kamath2012-01-201-1/+1
| |/ / /
* | | | am 02bc3ffe: am 1e78bd01: Merge "Observer for GPS is never added back."Jean-Baptiste Queru2012-01-121-1/+2
|\ \ \ \
| * \ \ \ am 1e78bd01: Merge "Observer for GPS is never added back."Jean-Baptiste Queru2012-01-121-1/+2
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge "Observer for GPS is never added back."Jean-Baptiste Queru2012-01-121-1/+2
| | |\ \ \
| | | * | | Observer for GPS is never added back.Vladimir Baryshnikov2012-01-031-1/+2
| | |/ / /
* | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-120-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-110-0/+0
| |\ \ \ \ | | |_|_|/ | |/| | |
* | | | | am af487099: Merge "Fix 4560303: Add setting to lock later when power button ...Jim Miller2012-01-106-0/+29
|\| | | |
| * | | | Merge "Fix 4560303: Add setting to lock later when power button pressed" into...Jim Miller2012-01-106-0/+29
| |\ \ \ \
| | * | | | Fix 4560303: Add setting to lock later when power button pressedJim Miller2012-01-096-0/+29
* | | | | | am aaff44c8: Don\'t allow wifi tethering when running monkeys.Amith Yamasani2012-01-091-1/+1
|\| | | | |
| * | | | | Don't allow wifi tethering when running monkeys.Amith Yamasani2012-01-091-1/+1
* | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-060-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-060-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
* | | | | | am da68fd46: Merge "Android OS battery usage overstated by screen on time" in...Todd Poynor2012-01-051-1/+2
|\| | | | | | |_|_|/ / |/| | | |
| * | | | Merge "Android OS battery usage overstated by screen on time" into ics-mr1Todd Poynor2012-01-051-1/+2
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Android OS battery usage overstated by screen on timeTodd Poynor2012-01-051-1/+2
* | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-210-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-200-0/+0
| |\ \ \ \ | | |/ / / | |/| | |
* | | | | am a98c353f: Don\'t enable SIM PIN Lock menu if SIM is not availableKazuhiro Ondo2011-12-201-0/+8
|\| | | | | |_|_|/ |/| | |
| * | | Don't enable SIM PIN Lock menu if SIM is not availableKazuhiro Ondo2011-12-201-0/+8
| | |/ | |/|
* | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-130-0/+0
|\ \ \ | | |/ | |/|
| * | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-130-0/+0
| |\ \ | | |/ | |/|
* | | am 2bccd7f4: Import revised translations. DO NOT MERGEEric Fischer2011-12-1340-172/+88
|\| |
| * | Import revised translations. DO NOT MERGEEric Fischer2011-12-1340-172/+88
* | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-130-0/+0
|\ \ \ | | |/ | |/|
| * | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-120-0/+0
| |\ \ | | |/ | |/|
* | | am 080691ed: Import revised translations. DO NOT MERGEEric Fischer2011-12-1251-88/+241
|\| |