summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* am 8ac35e30: Merge "Only write network stats when already loaded." into ics-mr1Jeff Sharkey2011-11-172-5/+14
|\
| * Merge "Only write network stats when already loaded." into ics-mr1Jeff Sharkey2011-11-172-5/+14
| |\
| | * Only write network stats when already loaded.Jeff Sharkey2011-11-172-5/+14
* | | am b9df01d3: Merge "Update NTP outside locks, log large trim events." into ic...Jeff Sharkey2011-11-163-19/+64
|\ \ \ | |/ /
| * | Merge "Update NTP outside locks, log large trim events." into ics-mr1Jeff Sharkey2011-11-163-19/+64
| |\ \ | | |/
| | * Update NTP outside locks, log large trim events.Jeff Sharkey2011-11-163-19/+64
* | | am d5decdcc: Merge "Disable desk dock apps." into ics-mr1Daniel Sandler2011-11-161-4/+12
|\ \ \ | |/ /
| * | Merge "Disable desk dock apps." into ics-mr1Daniel Sandler2011-11-161-4/+12
| |\ \
| | * | Disable desk dock apps.Daniel Sandler2011-11-161-4/+12
* | | | am 1125f89e: Merge "remove hack that hardcoded the refresh rate" into ics-mr1Mathias Agopian2011-11-161-4/+0
|\ \ \ \ | |/ / /
| * | | Merge "remove hack that hardcoded the refresh rate" into ics-mr1Mathias Agopian2011-11-161-4/+0
| |\ \ \
| | * | | remove hack that hardcoded the refresh rateMathias Agopian2011-11-161-4/+0
* | | | | am e5febfd5: Merge "Clean up the spell checker framework" into ics-mr1satok2011-11-161-4/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Clean up the spell checker framework" into ics-mr1satok2011-11-161-4/+2
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Clean up the spell checker frameworksatok2011-11-171-4/+2
| | | |/ | | |/|
* | | | am 4c6a65bc: Merge "Maybe fix issue #5627399: java.lang.RuntimeException - Wh...Dianne Hackborn2011-11-162-131/+395
|\ \ \ \ | |/ / /
| * | | Maybe fix issue #5627399: java.lang.RuntimeException - While sign in...Dianne Hackborn2011-11-162-131/+395
| | |/ | |/|
* | | am 3e7497b4: Merge "Eliminate hw.keyboards system properties." into ics-mr1Jeff Brown2011-11-155-19/+28
|\ \ \ | |/ /
| * | Merge "Eliminate hw.keyboards system properties." into ics-mr1Jeff Brown2011-11-155-19/+28
| |\ \
| | * | Eliminate hw.keyboards system properties.Jeff Brown2011-11-155-19/+28
* | | | am cdec187a: Merge "Whoops, need to acquire lock." into ics-mr1Dianne Hackborn2011-11-151-8/+10
|\ \ \ \ | |/ / /
| * | | Merge "Whoops, need to acquire lock." into ics-mr1Dianne Hackborn2011-11-151-8/+10
| |\ \ \
| | * | | Whoops, need to acquire lock.Dianne Hackborn2011-11-151-8/+10
* | | | | am c0fa2a3b: Merge "rework a bit how we manage EGL extensions" into ics-mr1Mathias Agopian2011-11-151-16/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge "rework a bit how we manage EGL extensions" into ics-mr1Mathias Agopian2011-11-151-16/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | rework a bit how we manage EGL extensionsMathias Agopian2011-11-141-16/+0
* | | | | am 5f11d73c: Merge "Improve low memory dropbox reporting." into ics-mr1Dianne Hackborn2011-11-152-52/+112
|\ \ \ \ \ | |/ / / /
| * | | | Improve low memory dropbox reporting.Dianne Hackborn2011-11-152-52/+112
| | |_|/ | |/| |
* | | | am 4b7494e0: Merge "Updating recent apps visuals on tablet" into ics-mr1Michael Jurka2011-11-151-2/+14
|\ \ \ \ | |/ / /
| * | | Merge "Updating recent apps visuals on tablet" into ics-mr1Michael Jurka2011-11-141-2/+14
| |\ \ \
| | * | | Updating recent apps visuals on tabletMichael Jurka2011-11-141-2/+14
* | | | | am d968670d: Merge "Conservatively trim data usage stats." into ics-mr1Jeff Sharkey2011-11-152-22/+39
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Conservatively trim data usage stats." into ics-mr1Jeff Sharkey2011-11-142-22/+39
| |\ \ \ \
| | * | | | Conservatively trim data usage stats.Jeff Sharkey2011-11-142-22/+39
| | | |/ / | | |/| |
* | | | | am 91c2b5ce: Merge "Improve low memory reporting." into ics-mr1Dianne Hackborn2011-11-152-5/+33
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Improve low memory reporting." into ics-mr1Dianne Hackborn2011-11-142-5/+33
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Improve low memory reporting.Dianne Hackborn2011-11-142-5/+33
| | |/ /
* | | | resolved conflicts for merge of f10a5364 to ics-aahJason Simmons2011-11-142-18/+21
|\ \ \ \ | |/ / /
| * | | Maybe fix issue #5405788: Device continuously opening and closing...Dianne Hackborn2011-11-142-18/+21
| |/ /
* | | am 030bb998: Merge "audioflinger: fix noise when skipping to next song" into ...Eric Laurent2011-11-142-13/+35
|\ \ \ | |/ /
| * | Merge "audioflinger: fix noise when skipping to next song" into ics-mr1Eric Laurent2011-11-142-13/+35
| |\ \ | | |/ | |/|
| | * audioflinger: fix noise when skipping to next songEric Laurent2011-11-112-13/+35
* | | am be70785f: Make activity manager more robust in the face of app activity le...Dianne Hackborn2011-11-114-119/+198
|\ \ \ | |/ /
| * | Make activity manager more robust in the face of app activity leaks.Dianne Hackborn2011-11-114-119/+198
* | | am 24597eb7: Merge "Tone down Tethering logs." into ics-mr1Robert Greenwalt2011-11-111-12/+11
|\ \ \ | |/ /
| * | Merge "Tone down Tethering logs." into ics-mr1Robert Greenwalt2011-11-111-12/+11
| |\ \
| | * | Tone down Tethering logs.Robert Greenwalt2011-11-111-12/+11
* | | | am 424781e2: Fix NPE in ConnectivityService.Robert Greenwalt2011-11-111-0/+1
|\ \ \ \ | |/ / /
| * | | Fix NPE in ConnectivityService.Robert Greenwalt2011-11-111-0/+1
* | | | am 51c00a57: Merge "Clamp non-monotonic stats instead of dropping." into ics-mr1Jeff Sharkey2011-11-111-6/+23
|\ \ \ \ | |/ / /