summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix a MediaBuffer leak in Stagefright.Jamie Gennis2010-11-032-34/+31
* Merge "Add STATE_AUDIO_CONNECTING state."Jaikumar Ganesh2010-11-033-4/+37
|\
| * Add STATE_AUDIO_CONNECTING state.Jaikumar Ganesh2010-11-033-4/+37
* | Merge "Experimentally reenable mpeg4 and h.263 hardware decoders."Andreas Huber2010-11-031-2/+2
|\ \
| * | Experimentally reenable mpeg4 and h.263 hardware decoders.Andreas Huber2010-11-031-2/+2
* | | Merge "Prevent 0 content width."Shimeng (Simon) Wang2010-11-031-3/+7
|\ \ \
| * | | Prevent 0 content width.Shimeng (Simon) Wang2010-11-031-3/+7
* | | | Merge "RS Error cleanup. Thow java exception during init if the GL driver fai...Jason Sams2010-11-038-28/+191
|\ \ \ \
| * | | | RS Error cleanup.Jason Sams2010-11-038-28/+191
* | | | | Merge "Avoid copying byte arrays when just decoding bounds."Bryan Mawhinney2010-11-031-5/+11
|\ \ \ \ \
| * | | | | Avoid copying byte arrays when just decoding bounds.Bryan Mawhinney2010-11-031-5/+11
| | |_|/ / | |/| | |
* | | | | Split strings referring to "phone" into phone and tablet variants.Eric Fischer2010-11-031-45/+183
* | | | | Merge "Layoutlib native delegate: primitive shapes and shaders"Xavier Ducrohet2010-11-0312-348/+524
|\ \ \ \ \
| * | | | | Layoutlib native delegate: primitive shapes and shadersXavier Ducrohet2010-11-0312-348/+524
* | | | | | Merge "More layout Canvas/Paint implementation."Xavier Ducrohet2010-11-032-36/+161
|\ \ \ \ \ \ | |/ / / / /
| * | | | | More layout Canvas/Paint implementation.Xavier Ducrohet2010-11-012-36/+161
* | | | | | am 9f4f20c2: am 65816a32: Merge "Fix the fix for storage ANRs." into gingerbreadDaniel Sandler2010-11-031-2/+29
|\ \ \ \ \ \
| * \ \ \ \ \ am 65816a32: Merge "Fix the fix for storage ANRs." into gingerbreadDaniel Sandler2010-11-031-2/+29
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge "Fix the fix for storage ANRs." into gingerbreadDaniel Sandler2010-11-031-2/+29
| | |\ \ \ \ \ \
| | | * | | | | | Fix the fix for storage ANRs.Daniel Sandler2010-11-031-2/+29
* | | | | | | | | Merge "Set country code in the driver and remove channel set"Irfan Sheriff2010-11-0311-294/+112
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Set country code in the driver and remove channel setIrfan Sheriff2010-11-0211-294/+112
* | | | | | | | | | Merge "Tapping in a empty textEdit shows the handle."Gilles Debunne2010-11-031-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Tapping in a empty textEdit shows the handle.Gilles Debunne2010-11-031-1/+1
* | | | | | | | | | | Merge "Fix issue where home layout click listener was being attached before i...Ben Komalo2010-11-031-17/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix issue where home layout click listener was being attachedBen Komalo2010-11-031-17/+12
* | | | | | | | | | | | Merge "Make Theme.Holo.Dialog.Alert and Theme.Holo.Light.Dialog.Alert public"Adam Powell2010-11-032-8/+32
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Make Theme.Holo.Dialog.Alert and Theme.Holo.Light.Dialog.Alert publicAdam Powell2010-11-032-8/+32
* | | | | | | | | | | | am a3f5b615: (-s ours) am f3847e87: Merge "DO NOT MERGE" into gingerbreadJames Dong2010-11-030-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | am f3847e87: Merge "DO NOT MERGE" into gingerbreadJames Dong2010-11-032-3/+30
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge "DO NOT MERGE" into gingerbreadJames Dong2010-11-032-3/+30
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | DO NOT MERGEJames Dong2010-11-022-3/+30
* | | | | | | | | | | | Merge "Fix drag enter/exit reporting"Chris Tate2010-11-033-19/+44
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix drag enter/exit reportingChris Tate2010-11-023-19/+44
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | am 0ce0f72c: am 906b830d: Revert "UMS: Avoid SystemUI ANRs during long vold o...Dianne Hackborn2010-11-031-29/+2
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | am 906b830d: Revert "UMS: Avoid SystemUI ANRs during long vold operations."Dianne Hackborn2010-11-021-29/+2
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Revert "UMS: Avoid SystemUI ANRs during long vold operations."Dianne Hackborn2010-11-021-29/+2
* | | | | | | | | | | am 1df8765a: am cbc3219d: Merge "UMS: Avoid SystemUI ANRs during long vold op...Daniel Sandler2010-11-031-2/+29
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am cbc3219d: Merge "UMS: Avoid SystemUI ANRs during long vold operations." in...Daniel Sandler2010-11-021-2/+29
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge "UMS: Avoid SystemUI ANRs during long vold operations." into gingerbreadDaniel Sandler2010-11-021-2/+29
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | UMS: Avoid SystemUI ANRs during long vold operations.Daniel Sandler2010-11-021-2/+29
* | | | | | | | | | | | am bcbf17a5: am 73eba2a6: Merge "Return a zero length byte from toByteArray i...Jason parks2010-11-031-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 73eba2a6: Merge "Return a zero length byte from toByteArray instead of nul...Jason parks2010-11-021-3/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge "Return a zero length byte from toByteArray instead of null." into ging...Jason parks2010-11-021-3/+5
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Return a zero length byte from toByteArray instead of null.Jason parks2010-11-021-3/+5
* | | | | | | | | | | | am 243a28ba: am 4e4d0d5f: am 36a1bcee: Merge "Doc change: Update uses-feature...Dirk Dougherty2010-11-035-483/+1159
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 4e4d0d5f: am 36a1bcee: Merge "Doc change: Update uses-feature and permissi...Dirk Dougherty2010-11-025-483/+1159
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am 36a1bcee: Merge "Doc change: Update uses-feature and permissions docs." in...Dirk Dougherty2010-11-025-483/+1159
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Merge "Doc change: Update uses-feature and permissions docs." into froyoDirk Dougherty2010-11-025-483/+1159
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Doc change: Update uses-feature and permissions docs.Dirk Dougherty2010-11-025-483/+1159