Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am f5fd08d6: am a1240184: Merge "Fix issue #5433192 and maybe #5433192" into ... | Dianne Hackborn | 2011-11-30 | 3 | -2/+10 |
|\ | |||||
| * | am a1240184: Merge "Fix issue #5433192 and maybe #5433192" into ics-mr1 | Dianne Hackborn | 2011-11-30 | 3 | -2/+10 |
| |\ | |||||
| | * | Merge "Fix issue #5433192 and maybe #5433192" into ics-mr1 | Dianne Hackborn | 2011-11-30 | 3 | -2/+10 |
| | |\ | |||||
| | | * | Fix issue #5433192 and maybe #5433192 | Dianne Hackborn | 2011-11-30 | 3 | -2/+10 |
* | | | | Merge "Optimize away unnecessary state changes" | Romain Guy | 2011-11-30 | 7 | -38/+58 |
|\ \ \ \ | |||||
| * | | | | Optimize away unnecessary state changes | Romain Guy | 2011-11-30 | 7 | -38/+58 |
* | | | | | Merge "TextLayoutCache Code cleaning" | Fabrice Di Meglio | 2011-11-30 | 1 | -5/+1 |
|\ \ \ \ \ | |||||
| * | | | | | TextLayoutCache Code cleaning | Fabrice Di Meglio | 2011-11-30 | 1 | -5/+1 |
* | | | | | | Fixing the build | Svetoslav Ganov | 2011-11-30 | 2 | -1/+2 |
* | | | | | | Fixing the build - for real | Svetoslav Ganov | 2011-11-30 | 1 | -4/+4 |
* | | | | | | Fixing the build | Svetoslav Ganov | 2011-11-30 | 1 | -2/+4 |
* | | | | | | am b7dda6d3: am b94a7fb3: Merge "Fix ConcurrentModificationException in TextS... | satok | 2011-11-30 | 1 | -1/+9 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | am b94a7fb3: Merge "Fix ConcurrentModificationException in TextServicesManage... | satok | 2011-11-30 | 1 | -1/+9 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge "Fix ConcurrentModificationException in TextServicesManagerService" int... | satok | 2011-11-30 | 1 | -1/+9 |
| | |\ \ \ \ | |||||
| | | * | | | | Fix ConcurrentModificationException in TextServicesManagerService | satok | 2011-11-30 | 1 | -1/+9 |
* | | | | | | | resolved conflicts for merge of 26f7a81f to master | Svetoslav Ganov | 2011-11-30 | 10 | -325/+425 |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | | | |||||
| * | | | | | am d8ec8db5: Merge "Fixing memory leaks in the accessiiblity layer." into ics... | Svetoslav Ganov | 2011-11-30 | 10 | -312/+416 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge "Fixing memory leaks in the accessiiblity layer." into ics-mr1 | Svetoslav Ganov | 2011-11-30 | 10 | -312/+416 |
| | |\ \ \ \ | |||||
| | | * | | | | Fixing memory leaks in the accessiiblity layer. | Svetoslav Ganov | 2011-11-29 | 10 | -312/+416 |
* | | | | | | | Merge "Improve TextLayoutCache logging" | Fabrice Di Meglio | 2011-11-30 | 2 | -62/+80 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Improve TextLayoutCache logging | Fabrice Di Meglio | 2011-11-30 | 2 | -62/+80 |
* | | | | | | | | am 2fc9467e: am 88f10c6c: Merge "Fix issue #5679504: Device stuck and sudden ... | Dianne Hackborn | 2011-11-30 | 2 | -40/+63 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | am 88f10c6c: Merge "Fix issue #5679504: Device stuck and sudden reboot - Watc... | Dianne Hackborn | 2011-11-30 | 2 | -40/+63 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | Merge "Fix issue #5679504: Device stuck and sudden reboot - Watchdog reset?" ... | Dianne Hackborn | 2011-11-30 | 2 | -40/+63 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Fix issue #5679504: Device stuck and sudden reboot - Watchdog reset? | Dianne Hackborn | 2011-11-30 | 2 | -40/+63 |
* | | | | | | | | | am a5b8883b: am f8d20bd6: Merge "Turn off debug log." into ics-mr1 | Dianne Hackborn | 2011-11-30 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | am f8d20bd6: Merge "Turn off debug log." into ics-mr1 | Dianne Hackborn | 2011-11-30 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Merge "Turn off debug log." into ics-mr1 | Dianne Hackborn | 2011-11-30 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | Turn off debug log. | Dianne Hackborn | 2011-11-30 | 1 | -1/+1 |
| | | | |_|_|_|_|/ | | | |/| | | | | | |||||
* | | | | | | | | | am 937925f5: am 7797cae2: Merge "Cache drawable constant states instead of dr... | Romain Guy | 2011-11-30 | 1 | -16/+21 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | am 7797cae2: Merge "Cache drawable constant states instead of drawables Bug #... | Romain Guy | 2011-11-30 | 1 | -16/+21 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Merge "Cache drawable constant states instead of drawables Bug #5678369" into... | Romain Guy | 2011-11-30 | 1 | -16/+21 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | Cache drawable constant states instead of drawables | Romain Guy | 2011-11-30 | 1 | -16/+21 |
* | | | | | | | | | | am e2970700: am e8ba2aba: Merge "add a way to access the version string of th... | Mathias Agopian | 2011-11-30 | 3 | -2/+19 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | am e8ba2aba: Merge "add a way to access the version string of the h/w impleme... | Mathias Agopian | 2011-11-30 | 3 | -2/+19 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | Merge "add a way to access the version string of the h/w implementation of EG... | Mathias Agopian | 2011-11-30 | 3 | -2/+19 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | add a way to access the version string of the h/w implementation of EGL | Mathias Agopian | 2011-11-29 | 3 | -2/+19 |
* | | | | | | | | | | | Merge "Add support for country specific emergency number handling." | David Brown | 2011-11-30 | 1 | -70/+61 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Add support for country specific emergency number handling. | Shaopeng Jia | 2011-11-20 | 1 | -70/+61 |
* | | | | | | | | | | | | Reconcile with ics-mr1-release | The Android Open Source Project | 2011-11-30 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-11-30 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-11-29 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-11-28 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | \ \ \ \ \ \ \ \ \ \ \ \ | am 7413d49b: am 865b9802: Merge "Expanding NotificationManager\'s event loggi... | Daniel Sandler | 2011-11-30 | 2 | -6/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | am 865b9802: Merge "Expanding NotificationManager\'s event logging." into ics... | Daniel Sandler | 2011-11-30 | 2 | -6/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Merge "Expanding NotificationManager's event logging." into ics-mr1 | Daniel Sandler | 2011-11-30 | 2 | -6/+9 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | Expanding NotificationManager's event logging. | Daniel Sandler | 2011-11-29 | 2 | -6/+9 |
| | | | |_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | am 827eed06: am 47e4015b: Merge "Avoid airplane mode labels when Wi-Fi enable... | Jeff Sharkey | 2011-11-30 | 1 | -7/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | am 47e4015b: Merge "Avoid airplane mode labels when Wi-Fi enabled." into ics-mr1 | Jeff Sharkey | 2011-11-30 | 1 | -7/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | Merge "Avoid airplane mode labels when Wi-Fi enabled." into ics-mr1 | Jeff Sharkey | 2011-11-30 | 1 | -7/+11 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | |