summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | am 010bb273: Merge changes I0da0f04f,I93197665 into ics-mr1Daniel Sandler2011-11-074-6/+91
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge changes I0da0f04f,I93197665 into ics-mr1Daniel Sandler2011-11-074-6/+91
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Offer the user an option to launch Dreams when docked.Daniel Sandler2011-11-043-0/+52
| | * | | | | | | | | | | Teach UiModeMgr about high-end and low-end desk docks.Daniel Sandler2011-11-041-6/+39
| | | |/ / / / / / / / / | | |/| | | | | | | | |
* | | | | | | | | | | | am 064975c2: Reconcile with ics-mr0-release ics-factoryrom-2-releaseThe Android Open Source Project2011-11-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | / / / / | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| | | | | | | | | | |
| | \ \ \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ \ \ Reconcile with ics-mr0-release ics-factoryrom-2-releaseThe Android Open Source Project2011-11-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
| | | * | | | | | | | | Fix a leak in Parcel::writeBlob.Jeff Brown2011-11-042-10/+6
| | | * | | | | | | | | DO NOT MERGE Poll input data with a small timeout and don't consume a full core.Andreas Huber2011-11-041-1/+1
| | * | | | | | | | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-060-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| | | * | | | | | | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-050-0/+0
| | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-040-0/+0
| | | | |\ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | Was generating code that uses the wrong RpcData.Joe Onorato2011-11-061-3/+3
* | | | | | | | | | | | | | am 6581043a: am 7311bd4b: Merge "Print out memory info when we get into a low...Dianne Hackborn2011-11-051-9/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | am 7311bd4b: Merge "Print out memory info when we get into a low memory situa...Dianne Hackborn2011-11-051-9/+69
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Merge "Print out memory info when we get into a low memory situation." into i...Dianne Hackborn2011-11-051-9/+69
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Print out memory info when we get into a low memory situation.Dianne Hackborn2011-11-041-9/+69
* | | | | | | | | | | | | | am 3f24589e: Merge "workaround to set the WM refresh rate to 48 Hz for tuna d...Mathias Agopian2011-11-053-6/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge "workaround to set the WM refresh rate to 48 Hz for tuna devices only" ...Mathias Agopian2011-11-043-6/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | workaround to set the WM refresh rate to 48 Hz for tuna devices onlyMathias Agopian2011-11-043-6/+17
* | | | | | | | | | | | | | | am 88061d6b: am 5462bc63: Fix a leak in Parcel::writeBlob.Jeff Brown2011-11-052-10/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | am 5462bc63: Fix a leak in Parcel::writeBlob.Jeff Brown2011-11-052-10/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| / / / / / / / / / / / / | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Fix a leak in Parcel::writeBlob.Jeff Brown2011-11-042-10/+6
* | | | | | | | | | | | | | am 2ccc47b8: Merge "Memory optimizations for libhwui Bug #5566149" into ics-mr1Romain Guy2011-11-046-27/+127
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge "Memory optimizations for libhwui Bug #5566149" into ics-mr1Romain Guy2011-11-046-27/+127
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Memory optimizations for libhwuiRomain Guy2011-11-046-27/+127
* | | | | | | | | | | | | | | am fd900f05: am 348297ab: Merge "Start using IP tool for advanced routing." i...Robert Greenwalt2011-11-044-52/+120
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | am 348297ab: Merge "Start using IP tool for advanced routing." into ics-mr0Robert Greenwalt2011-11-044-52/+120
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge "Start using IP tool for advanced routing." into ics-mr0Robert Greenwalt2011-11-044-52/+120
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | Start using IP tool for advanced routing.Robert Greenwalt2011-11-044-52/+120
* | | | | | | | | | | | | | | am 2ab7ec90: Merge "EGL: Add stubs for EGL_ANDROID_blob_cache" into ics-mr1Jamie Gennis2011-11-045-1/+139
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge "EGL: Add stubs for EGL_ANDROID_blob_cache" into ics-mr1Jamie Gennis2011-11-045-1/+139
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | EGL: Add stubs for EGL_ANDROID_blob_cacheJamie Gennis2011-11-045-1/+139
* | | | | | | | | | | | | | | | am 960177ae: am ca250167: (-s ours) Merge "DO NOT MERGE. Integrate: Include ...Dianne Hackborn2011-11-040-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | am ca250167: (-s ours) Merge "DO NOT MERGE. Integrate: Include showmap outpu...Dianne Hackborn2011-11-040-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "DO NOT MERGE. Integrate: Include showmap output in bug report." into ...Dianne Hackborn2011-11-043-0/+14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | DO NOT MERGE. Integrate: Include showmap output in bug report.Dianne Hackborn2011-11-043-0/+14
| | | | |_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | | am a3af4c94: am 3ee47188: Frame rate to 48 fpsDave Burke2011-11-041-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | am 3ee47188: Frame rate to 48 fpsDave Burke2011-11-041-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | / / / / / | | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Frame rate to 48 fpsDave Burke2011-11-041-1/+6
| | |/ / / / / / / / / / / /
* | | | | | | | | | | | | | Merge "close input streams obtained from otacerts zip file" into ics-aahDoug Zongker2011-11-041-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | close input streams obtained from otacerts zip fileDoug Zongker2011-11-041-3/+7
* | | | | | | | | | | | | | | am 515c6b44: Merge "fix an issue where SensorService could request an invalid...Mathias Agopian2011-11-041-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge "fix an issue where SensorService could request an invalid sensor delay...Mathias Agopian2011-11-041-2/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | fix an issue where SensorService could request an invalid sensor delayMathias Agopian2011-11-011-2/+8
* | | | | | | | | | | | | | | am 45a04db3: Merge "Avoid quick shutdown after a driver start" into ics-mr1Irfan Sheriff2011-11-042-43/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge "Avoid quick shutdown after a driver start" into ics-mr1Irfan Sheriff2011-11-042-43/+51
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Avoid quick shutdown after a driver startIrfan Sheriff2011-11-032-43/+51
* | | | | | | | | | | | | | | | am eaa17b76: Merge "Add an API for querying / enabling network TTS support." ...Narayan Kamath2011-11-044-2/+113
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge "Add an API for querying / enabling network TTS support." into ics-mr1Narayan Kamath2011-11-044-2/+113
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Add an API for querying / enabling network TTS support.Narayan Kamath2011-11-024-2/+113