Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Reconcile with ics-factoryrom-release | The Android Open Source Project | 2011-09-22 | 0 | -0/+0 |
|\ | |||||
| * | merge in ics-factoryrom-release history after reset to ics-factoryrom | The Android Automerger | 2011-09-21 | 0 | -0/+0 |
| |\ | |||||
* | \ | am 0d299625: Merge "Bring back the Android Beam settings panel." into ics-fac... | Jeff Hamilton | 2011-09-22 | 7 | -3/+191 |
|\ \ \ | |||||
| * \ \ | Merge "Bring back the Android Beam settings panel." into ics-factoryrom | Jeff Hamilton | 2011-09-22 | 7 | -3/+191 |
| |\ \ \ | |||||
| | * | | | Bring back the Android Beam settings panel. | Jeff Hamilton | 2011-09-22 | 7 | -3/+191 |
* | | | | | am 4a2aabc4: Merge "Add strings for translation." into ics-factoryrom | Jeff Hamilton | 2011-09-22 | 1 | -0/+15 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge "Add strings for translation." into ics-factoryrom | Jeff Hamilton | 2011-09-22 | 1 | -0/+15 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Add strings for translation. | Jeff Hamilton | 2011-09-22 | 1 | -0/+15 |
* | | | | | am 9ee164f4: Properly initialize wakelock for cryptkeeper. | Ben Komalo | 2011-09-22 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Properly initialize wakelock for cryptkeeper. | Ben Komalo | 2011-09-21 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | Reconcile with ics-factoryrom-release | The Android Open Source Project | 2011-09-21 | 0 | -0/+0 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | merge in ics-factoryrom-release history after reset to ics-factoryrom | The Android Automerger | 2011-09-20 | 0 | -0/+0 |
| |\ \ \ | |||||
* | \ \ \ | am 89cd48cd: Merge "Accessibility settings get into state not allowing to ena... | Svetoslav Ganov | 2011-09-20 | 1 | -43/+85 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge "Accessibility settings get into state not allowing to enable accessibi... | Svetoslav Ganov | 2011-09-20 | 1 | -43/+85 |
| |\ \ \ \ | |||||
| | * | | | | Accessibility settings get into state not allowing to enable accessibility. | Svetoslav Ganov | 2011-09-20 | 1 | -43/+85 |
* | | | | | | am bce7b69a: Merge "Move "Pulse notification light" to Display settings." int... | Amith Yamasani | 2011-09-20 | 4 | -27/+28 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge "Move "Pulse notification light" to Display settings." into ics-factoryrom | Amith Yamasani | 2011-09-20 | 4 | -27/+28 |
| |\ \ \ \ \ | |||||
| | * | | | | | Move "Pulse notification light" to Display settings. | Amith Yamasani | 2011-09-20 | 4 | -27/+28 |
* | | | | | | | am f85b8b1a: (-s ours) Merge "Import revised translations. DO NOT MERGE" int... | Eric Fischer | 2011-09-20 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom | Eric Fischer | 2011-09-20 | 86 | -1223/+1017 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Import revised translations. DO NOT MERGE | Eric Fischer | 2011-09-20 | 86 | -1223/+1017 |
| | |/ / / / / | |||||
* | | | | | | | am 01b20096: Merge "adjust char limit for translations" into ics-factoryrom | Freeman Ng | 2011-09-20 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge "adjust char limit for translations" into ics-factoryrom | Freeman Ng | 2011-09-20 | 1 | -2/+2 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | adjust char limit for translations | Freeman Ng | 2011-09-20 | 1 | -2/+2 |
| | |/ / / / | |||||
* | | | | | | Merge "Allow shortcuts to Tethering and Data usage screens." | Amith Yamasani | 2011-09-20 | 1 | -0/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Allow shortcuts to Tethering and Data usage screens. | Amith Yamasani | 2011-09-19 | 1 | -0/+3 |
* | | | | | | | Merge "Import revised translations." | Eric Fischer | 2011-09-20 | 92 | -7454/+5874 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Import revised translations. | Eric Fischer | 2011-09-20 | 92 | -7454/+5874 |
* | | | | | | | | Merge "Change title in the setting for "Speech" category" | Luca Zanolin | 2011-09-20 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Change title in the setting for "Speech" category | Luca Zanolin | 2011-09-20 | 1 | -2/+2 |
* | | | | | | | | | Reconcile with ics-factoryrom-release | The Android Open Source Project | 2011-09-20 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | merge in ics-factoryrom-release history after reset to ics-factoryrom | The Android Automerger | 2011-09-20 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | Add Button to *#*#INFO#*#* for ims registration. | Wink Saville | 2011-09-19 | 3 | -0/+44 |
| | | |_|_|/ | | |/| | | | |||||
* | | | | | | am 69dfd425: Merge "Mark Settings as a "core" app." into ics-factoryrom | Ben Komalo | 2011-09-19 | 1 | -0/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge "Mark Settings as a "core" app." into ics-factoryrom | Ben Komalo | 2011-09-19 | 1 | -0/+1 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | Mark Settings as a "core" app. | Ben Komalo | 2011-09-19 | 1 | -0/+1 |
| | |/ / / | |||||
* | | | | | am 1e596f30: Add Button to *#*#INFO#*#* for ims registration. | Wink Saville | 2011-09-19 | 3 | -0/+44 |
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | |||||
| * | | | Add Button to *#*#INFO#*#* for ims registration. | Wink Saville | 2011-09-19 | 3 | -0/+44 |
| |/ / | |||||
* | | | am 2ae88521: Merge "Surface tethering stats in data usage." into ics-factoryrom | Jeff Sharkey | 2011-09-18 | 5 | -25/+46 |
|\ \ \ | |/ / | |||||
| * | | Merge "Surface tethering stats in data usage." into ics-factoryrom | Jeff Sharkey | 2011-09-18 | 5 | -25/+46 |
| |\ \ | |||||
| | * | | Surface tethering stats in data usage. | Jeff Sharkey | 2011-09-16 | 5 | -25/+46 |
* | | | | Fix race condition in MTP/PTP checkbox updating | Mike Lockwood | 2011-09-18 | 1 | -4/+4 |
* | | | | Merge "Adding info explaining facelock's backup lock" | Danielle Millett | 2011-09-16 | 3 | -2/+25 |
|\ \ \ \ | |||||
| * | | | | Adding info explaining facelock's backup lock | Danielle Millett | 2011-09-16 | 3 | -2/+25 |
* | | | | | am f4d6c876: (-s ours) Merge "Import revised translations. DO NOT MERGE" int... | Eric Fischer | 2011-09-16 | 0 | -0/+0 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom | Eric Fischer | 2011-09-16 | 92 | -7458/+5510 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | Import revised translations. DO NOT MERGE | Eric Fischer | 2011-09-16 | 92 | -7458/+5510 |
* | | | | | Merge "Update p2p settings UI" | Irfan Sheriff | 2011-09-16 | 2 | -2/+74 |
|\ \ \ \ \ | |||||
| * | | | | | Update p2p settings UI | Irfan Sheriff | 2011-09-16 | 2 | -2/+74 |
* | | | | | | Merge "Fix issue #5320747: Disabling an app that is an active device administ... | Dianne Hackborn | 2011-09-16 | 2 | -7/+39 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | |