summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Reconcile with ics-factoryrom-releaseThe Android Open Source Project2011-09-220-0/+0
|\
| * merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-09-210-0/+0
| |\
* | \ am 0d299625: Merge "Bring back the Android Beam settings panel." into ics-fac...Jeff Hamilton2011-09-227-3/+191
|\ \ \
| * \ \ Merge "Bring back the Android Beam settings panel." into ics-factoryromJeff Hamilton2011-09-227-3/+191
| |\ \ \
| | * | | Bring back the Android Beam settings panel.Jeff Hamilton2011-09-227-3/+191
* | | | | am 4a2aabc4: Merge "Add strings for translation." into ics-factoryromJeff Hamilton2011-09-221-0/+15
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Add strings for translation." into ics-factoryromJeff Hamilton2011-09-221-0/+15
| |\ \ \ \ | | |/ / /
| | * | | Add strings for translation.Jeff Hamilton2011-09-221-0/+15
* | | | | am 9ee164f4: Properly initialize wakelock for cryptkeeper.Ben Komalo2011-09-221-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Properly initialize wakelock for cryptkeeper.Ben Komalo2011-09-211-1/+1
| | |/ / | |/| |
* | | | Reconcile with ics-factoryrom-releaseThe Android Open Source Project2011-09-210-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-09-200-0/+0
| |\ \ \
* | \ \ \ am 89cd48cd: Merge "Accessibility settings get into state not allowing to ena...Svetoslav Ganov2011-09-201-43/+85
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge "Accessibility settings get into state not allowing to enable accessibi...Svetoslav Ganov2011-09-201-43/+85
| |\ \ \ \
| | * | | | Accessibility settings get into state not allowing to enable accessibility.Svetoslav Ganov2011-09-201-43/+85
* | | | | | am bce7b69a: Merge "Move "Pulse notification light" to Display settings." int...Amith Yamasani2011-09-204-27/+28
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Move "Pulse notification light" to Display settings." into ics-factoryromAmith Yamasani2011-09-204-27/+28
| |\ \ \ \ \
| | * | | | | Move "Pulse notification light" to Display settings.Amith Yamasani2011-09-204-27/+28
* | | | | | | am f85b8b1a: (-s ours) Merge "Import revised translations. DO NOT MERGE" int...Eric Fischer2011-09-200-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Import revised translations. DO NOT MERGE" into ics-factoryromEric Fischer2011-09-2086-1223/+1017
| |\ \ \ \ \ \
| | * | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-09-2086-1223/+1017
| | |/ / / / /
* | | | | | | am 01b20096: Merge "adjust char limit for translations" into ics-factoryromFreeman Ng2011-09-201-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "adjust char limit for translations" into ics-factoryromFreeman Ng2011-09-201-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | adjust char limit for translationsFreeman Ng2011-09-201-2/+2
| | |/ / / /
* | | | | | Merge "Allow shortcuts to Tethering and Data usage screens."Amith Yamasani2011-09-201-0/+3
|\ \ \ \ \ \
| * | | | | | Allow shortcuts to Tethering and Data usage screens.Amith Yamasani2011-09-191-0/+3
* | | | | | | Merge "Import revised translations."Eric Fischer2011-09-2092-7454/+5874
|\ \ \ \ \ \ \
| * | | | | | | Import revised translations.Eric Fischer2011-09-2092-7454/+5874
* | | | | | | | Merge "Change title in the setting for "Speech" category"Luca Zanolin2011-09-201-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Change title in the setting for "Speech" categoryLuca Zanolin2011-09-201-2/+2
* | | | | | | | | Reconcile with ics-factoryrom-releaseThe Android Open Source Project2011-09-200-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-09-200-0/+0
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | |
| | * | | | | Add Button to *#*#INFO#*#* for ims registration.Wink Saville2011-09-193-0/+44
| | | |_|_|/ | | |/| | |
* | | | | | am 69dfd425: Merge "Mark Settings as a "core" app." into ics-factoryromBen Komalo2011-09-191-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Mark Settings as a "core" app." into ics-factoryromBen Komalo2011-09-191-0/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Mark Settings as a "core" app.Ben Komalo2011-09-191-0/+1
| | |/ / /
* | | | | am 1e596f30: Add Button to *#*#INFO#*#* for ims registration.Wink Saville2011-09-193-0/+44
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | Add Button to *#*#INFO#*#* for ims registration.Wink Saville2011-09-193-0/+44
| |/ /
* | | am 2ae88521: Merge "Surface tethering stats in data usage." into ics-factoryromJeff Sharkey2011-09-185-25/+46
|\ \ \ | |/ /
| * | Merge "Surface tethering stats in data usage." into ics-factoryromJeff Sharkey2011-09-185-25/+46
| |\ \
| | * | Surface tethering stats in data usage.Jeff Sharkey2011-09-165-25/+46
* | | | Fix race condition in MTP/PTP checkbox updatingMike Lockwood2011-09-181-4/+4
* | | | Merge "Adding info explaining facelock's backup lock"Danielle Millett2011-09-163-2/+25
|\ \ \ \
| * | | | Adding info explaining facelock's backup lockDanielle Millett2011-09-163-2/+25
* | | | | am f4d6c876: (-s ours) Merge "Import revised translations. DO NOT MERGE" int...Eric Fischer2011-09-160-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge "Import revised translations. DO NOT MERGE" into ics-factoryromEric Fischer2011-09-1692-7458/+5510
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Import revised translations. DO NOT MERGEEric Fischer2011-09-1692-7458/+5510
* | | | | Merge "Update p2p settings UI"Irfan Sheriff2011-09-162-2/+74
|\ \ \ \ \
| * | | | | Update p2p settings UIIrfan Sheriff2011-09-162-2/+74
* | | | | | Merge "Fix issue #5320747: Disabling an app that is an active device administ...Dianne Hackborn2011-09-162-7/+39
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |