summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am f5fd08d6: am a1240184: Merge "Fix issue #5433192 and maybe #5433192" into ...Dianne Hackborn2011-11-303-2/+10
|\
| * am a1240184: Merge "Fix issue #5433192 and maybe #5433192" into ics-mr1Dianne Hackborn2011-11-303-2/+10
| |\
| | * Merge "Fix issue #5433192 and maybe #5433192" into ics-mr1Dianne Hackborn2011-11-303-2/+10
| | |\
| | | * Fix issue #5433192 and maybe #5433192Dianne Hackborn2011-11-303-2/+10
* | | | Merge "Optimize away unnecessary state changes"Romain Guy2011-11-307-38/+58
|\ \ \ \
| * | | | Optimize away unnecessary state changesRomain Guy2011-11-307-38/+58
* | | | | Merge "TextLayoutCache Code cleaning"Fabrice Di Meglio2011-11-301-5/+1
|\ \ \ \ \
| * | | | | TextLayoutCache Code cleaningFabrice Di Meglio2011-11-301-5/+1
* | | | | | Fixing the buildSvetoslav Ganov2011-11-302-1/+2
* | | | | | Fixing the build - for realSvetoslav Ganov2011-11-301-4/+4
* | | | | | Fixing the buildSvetoslav Ganov2011-11-301-2/+4
* | | | | | am b7dda6d3: am b94a7fb3: Merge "Fix ConcurrentModificationException in TextS...satok2011-11-301-1/+9
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | am b94a7fb3: Merge "Fix ConcurrentModificationException in TextServicesManage...satok2011-11-301-1/+9
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge "Fix ConcurrentModificationException in TextServicesManagerService" int...satok2011-11-301-1/+9
| | |\ \ \ \
| | | * | | | Fix ConcurrentModificationException in TextServicesManagerServicesatok2011-11-301-1/+9
* | | | | | | resolved conflicts for merge of 26f7a81f to masterSvetoslav Ganov2011-11-3010-325/+425
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | |
| * | | | | am d8ec8db5: Merge "Fixing memory leaks in the accessiiblity layer." into ics...Svetoslav Ganov2011-11-3010-312/+416
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Fixing memory leaks in the accessiiblity layer." into ics-mr1Svetoslav Ganov2011-11-3010-312/+416
| | |\ \ \ \
| | | * | | | Fixing memory leaks in the accessiiblity layer.Svetoslav Ganov2011-11-2910-312/+416
* | | | | | | Merge "Improve TextLayoutCache logging"Fabrice Di Meglio2011-11-302-62/+80
|\ \ \ \ \ \ \
| * | | | | | | Improve TextLayoutCache loggingFabrice Di Meglio2011-11-302-62/+80
* | | | | | | | am 2fc9467e: am 88f10c6c: Merge "Fix issue #5679504: Device stuck and sudden ...Dianne Hackborn2011-11-302-40/+63
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am 88f10c6c: Merge "Fix issue #5679504: Device stuck and sudden reboot - Watc...Dianne Hackborn2011-11-302-40/+63
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge "Fix issue #5679504: Device stuck and sudden reboot - Watchdog reset?" ...Dianne Hackborn2011-11-302-40/+63
| | |\ \ \ \ \ \
| | | * | | | | | Fix issue #5679504: Device stuck and sudden reboot - Watchdog reset?Dianne Hackborn2011-11-302-40/+63
* | | | | | | | | am a5b8883b: am f8d20bd6: Merge "Turn off debug log." into ics-mr1Dianne Hackborn2011-11-301-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am f8d20bd6: Merge "Turn off debug log." into ics-mr1Dianne Hackborn2011-11-301-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Turn off debug log." into ics-mr1Dianne Hackborn2011-11-301-1/+1
| | |\ \ \ \ \ \ \
| | | * | | | | | | Turn off debug log.Dianne Hackborn2011-11-301-1/+1
| | | | |_|_|_|_|/ | | | |/| | | | |
* | | | | | | | | am 937925f5: am 7797cae2: Merge "Cache drawable constant states instead of dr...Romain Guy2011-11-301-16/+21
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 7797cae2: Merge "Cache drawable constant states instead of drawables Bug #...Romain Guy2011-11-301-16/+21
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Cache drawable constant states instead of drawables Bug #5678369" into...Romain Guy2011-11-301-16/+21
| | |\ \ \ \ \ \ \
| | | * | | | | | | Cache drawable constant states instead of drawablesRomain Guy2011-11-301-16/+21
* | | | | | | | | | am e2970700: am e8ba2aba: Merge "add a way to access the version string of th...Mathias Agopian2011-11-303-2/+19
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am e8ba2aba: Merge "add a way to access the version string of the h/w impleme...Mathias Agopian2011-11-303-2/+19
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "add a way to access the version string of the h/w implementation of EG...Mathias Agopian2011-11-303-2/+19
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | add a way to access the version string of the h/w implementation of EGLMathias Agopian2011-11-293-2/+19
* | | | | | | | | | | Merge "Add support for country specific emergency number handling."David Brown2011-11-301-70/+61
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add support for country specific emergency number handling.Shaopeng Jia2011-11-201-70/+61
* | | | | | | | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-11-300-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-290-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-280-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ \ \ \ \ \ am 7413d49b: am 865b9802: Merge "Expanding NotificationManager\'s event loggi...Daniel Sandler2011-11-302-6/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | am 865b9802: Merge "Expanding NotificationManager\'s event logging." into ics...Daniel Sandler2011-11-302-6/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge "Expanding NotificationManager's event logging." into ics-mr1Daniel Sandler2011-11-302-6/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Expanding NotificationManager's event logging.Daniel Sandler2011-11-292-6/+9
| | | | |_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | | am 827eed06: am 47e4015b: Merge "Avoid airplane mode labels when Wi-Fi enable...Jeff Sharkey2011-11-301-7/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | am 47e4015b: Merge "Avoid airplane mode labels when Wi-Fi enabled." into ics-mr1Jeff Sharkey2011-11-301-7/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Merge "Avoid airplane mode labels when Wi-Fi enabled." into ics-mr1Jeff Sharkey2011-11-301-7/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | |