Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | am 010bb273: Merge changes I0da0f04f,I93197665 into ics-mr1 | Daniel Sandler | 2011-11-07 | 4 | -6/+91 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge changes I0da0f04f,I93197665 into ics-mr1 | Daniel Sandler | 2011-11-07 | 4 | -6/+91 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Offer the user an option to launch Dreams when docked. | Daniel Sandler | 2011-11-04 | 3 | -0/+52 | |
| | * | | | | | | | | | | | Teach UiModeMgr about high-end and low-end desk docks. | Daniel Sandler | 2011-11-04 | 1 | -6/+39 | |
| | | |/ / / / / / / / / | | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | | am 064975c2: Reconcile with ics-mr0-release ics-factoryrom-2-release | The Android Open Source Project | 2011-11-07 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | / / / / | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | ||||||
| | | | | | | | | | | | ||||||
| | \ \ \ \ \ \ \ \ \ | ||||||
| *-. \ \ \ \ \ \ \ \ \ | Reconcile with ics-mr0-release ics-factoryrom-2-release | The Android Open Source Project | 2011-11-07 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | ||||||
| | | * | | | | | | | | | Fix a leak in Parcel::writeBlob. | Jeff Brown | 2011-11-04 | 2 | -10/+6 | |
| | | * | | | | | | | | | DO NOT MERGE Poll input data with a small timeout and don't consume a full core. | Andreas Huber | 2011-11-04 | 1 | -1/+1 | |
| | * | | | | | | | | | | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-11-06 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | ||||||
| | | * | | | | | | | | | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-11-05 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-11-04 | 0 | -0/+0 | |
| | | | |\ \ \ \ \ \ \ \ \ | ||||||
* | | | | | | | | | | | | | | Was generating code that uses the wrong RpcData. | Joe Onorato | 2011-11-06 | 1 | -3/+3 | |
* | | | | | | | | | | | | | | am 6581043a: am 7311bd4b: Merge "Print out memory info when we get into a low... | Dianne Hackborn | 2011-11-05 | 1 | -9/+69 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | am 7311bd4b: Merge "Print out memory info when we get into a low memory situa... | Dianne Hackborn | 2011-11-05 | 1 | -9/+69 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | Merge "Print out memory info when we get into a low memory situation." into i... | Dianne Hackborn | 2011-11-05 | 1 | -9/+69 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | Print out memory info when we get into a low memory situation. | Dianne Hackborn | 2011-11-04 | 1 | -9/+69 | |
* | | | | | | | | | | | | | | am 3f24589e: Merge "workaround to set the WM refresh rate to 48 Hz for tuna d... | Mathias Agopian | 2011-11-05 | 3 | -6/+17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | Merge "workaround to set the WM refresh rate to 48 Hz for tuna devices only" ... | Mathias Agopian | 2011-11-04 | 3 | -6/+17 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | workaround to set the WM refresh rate to 48 Hz for tuna devices only | Mathias Agopian | 2011-11-04 | 3 | -6/+17 | |
* | | | | | | | | | | | | | | | am 88061d6b: am 5462bc63: Fix a leak in Parcel::writeBlob. | Jeff Brown | 2011-11-05 | 2 | -10/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | am 5462bc63: Fix a leak in Parcel::writeBlob. | Jeff Brown | 2011-11-05 | 2 | -10/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| / / / / / / / / / / / / | | |/ / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | Fix a leak in Parcel::writeBlob. | Jeff Brown | 2011-11-04 | 2 | -10/+6 | |
* | | | | | | | | | | | | | | am 2ccc47b8: Merge "Memory optimizations for libhwui Bug #5566149" into ics-mr1 | Romain Guy | 2011-11-04 | 6 | -27/+127 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | Merge "Memory optimizations for libhwui Bug #5566149" into ics-mr1 | Romain Guy | 2011-11-04 | 6 | -27/+127 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | Memory optimizations for libhwui | Romain Guy | 2011-11-04 | 6 | -27/+127 | |
* | | | | | | | | | | | | | | | am fd900f05: am 348297ab: Merge "Start using IP tool for advanced routing." i... | Robert Greenwalt | 2011-11-04 | 4 | -52/+120 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | am 348297ab: Merge "Start using IP tool for advanced routing." into ics-mr0 | Robert Greenwalt | 2011-11-04 | 4 | -52/+120 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Merge "Start using IP tool for advanced routing." into ics-mr0 | Robert Greenwalt | 2011-11-04 | 4 | -52/+120 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | Start using IP tool for advanced routing. | Robert Greenwalt | 2011-11-04 | 4 | -52/+120 | |
* | | | | | | | | | | | | | | | am 2ab7ec90: Merge "EGL: Add stubs for EGL_ANDROID_blob_cache" into ics-mr1 | Jamie Gennis | 2011-11-04 | 5 | -1/+139 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Merge "EGL: Add stubs for EGL_ANDROID_blob_cache" into ics-mr1 | Jamie Gennis | 2011-11-04 | 5 | -1/+139 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | EGL: Add stubs for EGL_ANDROID_blob_cache | Jamie Gennis | 2011-11-04 | 5 | -1/+139 | |
* | | | | | | | | | | | | | | | | am 960177ae: am ca250167: (-s ours) Merge "DO NOT MERGE. Integrate: Include ... | Dianne Hackborn | 2011-11-04 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | am ca250167: (-s ours) Merge "DO NOT MERGE. Integrate: Include showmap outpu... | Dianne Hackborn | 2011-11-04 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Merge "DO NOT MERGE. Integrate: Include showmap output in bug report." into ... | Dianne Hackborn | 2011-11-04 | 3 | -0/+14 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | DO NOT MERGE. Integrate: Include showmap output in bug report. | Dianne Hackborn | 2011-11-04 | 3 | -0/+14 | |
| | | | |_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | am a3af4c94: am 3ee47188: Frame rate to 48 fps | Dave Burke | 2011-11-04 | 1 | -1/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | am 3ee47188: Frame rate to 48 fps | Dave Burke | 2011-11-04 | 1 | -1/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | / / / / / | | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Frame rate to 48 fps | Dave Burke | 2011-11-04 | 1 | -1/+6 | |
| | |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge "close input streams obtained from otacerts zip file" into ics-aah | Doug Zongker | 2011-11-04 | 1 | -3/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | close input streams obtained from otacerts zip file | Doug Zongker | 2011-11-04 | 1 | -3/+7 | |
* | | | | | | | | | | | | | | | am 515c6b44: Merge "fix an issue where SensorService could request an invalid... | Mathias Agopian | 2011-11-04 | 1 | -2/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge "fix an issue where SensorService could request an invalid sensor delay... | Mathias Agopian | 2011-11-04 | 1 | -2/+8 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | fix an issue where SensorService could request an invalid sensor delay | Mathias Agopian | 2011-11-01 | 1 | -2/+8 | |
* | | | | | | | | | | | | | | | am 45a04db3: Merge "Avoid quick shutdown after a driver start" into ics-mr1 | Irfan Sheriff | 2011-11-04 | 2 | -43/+51 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Merge "Avoid quick shutdown after a driver start" into ics-mr1 | Irfan Sheriff | 2011-11-04 | 2 | -43/+51 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | Avoid quick shutdown after a driver start | Irfan Sheriff | 2011-11-03 | 2 | -43/+51 | |
* | | | | | | | | | | | | | | | | am eaa17b76: Merge "Add an API for querying / enabling network TTS support." ... | Narayan Kamath | 2011-11-04 | 4 | -2/+113 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | Merge "Add an API for querying / enabling network TTS support." into ics-mr1 | Narayan Kamath | 2011-11-04 | 4 | -2/+113 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | Add an API for querying / enabling network TTS support. | Narayan Kamath | 2011-11-02 | 4 | -2/+113 |