Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Rework thumbnails in activity manager." | Dianne Hackborn | 2011-04-08 | 5 | -62/+181 |
|\ | |||||
| * | Rework thumbnails in activity manager. | Dianne Hackborn | 2011-04-08 | 5 | -62/+181 |
* | | Add keychain user with special keystore access permissions | Brian Carlstrom | 2011-04-08 | 1 | -0/+5 |
* | | Remove the deprecated things from Config.java. These haven't been working sin... | Joe Onorato | 2011-04-07 | 8 | -21/+13 |
|/ | |||||
* | Improve activity manager debug dumps. | Dianne Hackborn | 2011-04-07 | 5 | -275/+700 |
* | am de1b950d: am 9e7a5a1e: Merge "ConnectivityService needs to use the new nam... | Wink Saville | 2011-04-07 | 1 | -18/+18 |
|\ | |||||
| * | am 9e7a5a1e: Merge "ConnectivityService needs to use the new names for the Ne... | Wink Saville | 2011-04-07 | 1 | -18/+18 |
| |\ | |||||
| | * | ConnectivityService needs to use the new names for the NetConfig vars. | Wink Saville | 2011-04-07 | 1 | -18/+18 |
* | | | am f4a29403: resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aosp | Robert Greenwalt | 2011-04-07 | 1 | -70/+65 |
|\ \ \ | |/ / | |||||
| * | | resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aosp | Robert Greenwalt | 2011-04-07 | 1 | -70/+65 |
| |\ \ | | |/ | |||||
| | * | Add external dependency API. | Robert Greenwalt | 2011-04-07 | 1 | -71/+66 |
* | | | Merge "Coalesce input events that arrive faster than 333Hz." | Jeff Brown | 2011-04-07 | 3 | -21/+101 |
|\ \ \ | |||||
| * | | | Coalesce input events that arrive faster than 333Hz. | Jeff Brown | 2011-04-07 | 3 | -21/+101 |
* | | | | Merge changes I4011db5c,I622bc5fa | Joe Onorato | 2011-04-06 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | less logging | Joe Onorato | 2011-04-06 | 1 | -1/+1 |
* | | | | | Merge "Allow batching samples onto the pending motion event." | Jeff Brown | 2011-04-06 | 1 | -0/+28 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | Allow batching samples onto the pending motion event. | Jeff Brown | 2011-04-06 | 1 | -0/+28 |
* | | | | Merge "Miscellaneous code cleanup in audio framework" | Glenn Kasten | 2011-04-06 | 2 | -5/+6 |
|\ \ \ \ | |||||
| * | | | | Miscellaneous code cleanup in audio framework | Glenn Kasten | 2011-04-06 | 2 | -5/+6 |
* | | | | | Merge "remove more unused references to ISurface" | Mathias Agopian | 2011-04-06 | 3 | -24/+3 |
|\ \ \ \ \ | |||||
| * | | | | | remove more unused references to ISurface | Mathias Agopian | 2011-04-05 | 3 | -24/+3 |
* | | | | | | Merge "turn off log spew" | Joe Onorato | 2011-04-06 | 2 | -2/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | turn off log spew | Joe Onorato | 2011-04-06 | 2 | -2/+1 |
* | | | | | | | Add new resource configurations for screen width/height in "dp". | Dianne Hackborn | 2011-04-06 | 1 | -0/+3 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | Merge "Don't use local ref for cached jclass reference in JNI code" | Brian Carlstrom | 2011-04-06 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Don't use local ref for cached jclass reference in JNI code | Brian Carlstrom | 2011-04-06 | 1 | -2/+2 |
| |/ / / / / | |||||
* | | | | | | Merge "Add support for supplicant SCAN_INTERVAL" | Irfan Sheriff | 2011-04-06 | 1 | -2/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Add support for supplicant SCAN_INTERVAL | Irfan Sheriff | 2011-04-06 | 1 | -2/+2 |
* | | | | | | Merge "MountService: Fix running media scanner at boot." | Mike Lockwood | 2011-04-05 | 1 | -0/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | MountService: Fix running media scanner at boot. | Mike Lockwood | 2011-04-05 | 1 | -0/+7 |
* | | | | | | | Merge "Fix deadlock in MountService" | Mike Lockwood | 2011-04-05 | 1 | -17/+32 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Fix deadlock in MountService | Mike Lockwood | 2011-04-05 | 1 | -17/+32 |
* | | | | | | | New fix for issue 4111672: control block flags | Eric Laurent | 2011-04-05 | 1 | -24/+16 |
* | | | | | | | Merge "Fix deadlock in BackupManagerService" | Christopher Tate | 2011-04-04 | 1 | -8/+8 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Fix deadlock in BackupManagerService | Christopher Tate | 2011-04-04 | 1 | -8/+8 |
* | | | | | | | Merge "StorageManager: Add getVolumeList() and getVolumeState() methods" | Mike Lockwood | 2011-04-04 | 1 | -0/+13 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | StorageManager: Add getVolumeList() and getVolumeState() methods | Mike Lockwood | 2011-04-04 | 1 | -0/+13 |
* | | | | | | | | Merge "MountService: Add support for multiple volumes" | Mike Lockwood | 2011-04-04 | 1 | -108/+111 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | / / / | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | MountService: Add support for multiple volumes | Mike Lockwood | 2011-04-04 | 1 | -108/+111 |
* | | | | | | | am e716a551: resolved conflicts for merge of ab2194aa to honeycomb-plus-aosp | Robert Greenwalt | 2011-04-04 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | resolved conflicts for merge of ab2194aa to honeycomb-plus-aosp | Robert Greenwalt | 2011-04-04 | 1 | -0/+1 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | am 27725e8c: Only leave one default network up at a time. | Robert Greenwalt | 2011-04-04 | 1 | -0/+1 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Only leave one default network up at a time. | Robert Greenwalt | 2011-03-29 | 1 | -0/+1 |
* | | | | | | | | | am 8f7aad14: am f7a34b15: am e558a000: Merge "Avoid crash in system server wh... | Brad Fitzpatrick | 2011-04-04 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | / / / / | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | am f7a34b15: am e558a000: Merge "Avoid crash in system server when mounting c... | Brad Fitzpatrick | 2011-04-04 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | am e558a000: Merge "Avoid crash in system server when mounting container" | Brad Fitzpatrick | 2011-04-04 | 1 | -1/+2 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Avoid crash in system server when mounting container | Fredrik Helmer | 2011-04-04 | 1 | -1/+2 |
| | * | | | | | | | am 05f14e2b: Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into ... | Irfan Sheriff | 2011-03-30 | 1 | -4/+4 |
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | |||||
| | | * | | | | | | Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread | Irfan Sheriff | 2011-03-25 | 1 | -4/+4 |
| | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | DO NOT MERGE Pick upstream intf with valid IP conf | Irfan Sheriff | 2011-03-25 | 1 | -4/+4 |