Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am ec04f4ac: am 7c063cf9: Merge "There\'s no point in trying to continue to d... | Andreas Huber | 2011-11-10 | 2 | -8/+11 |
|\ | |||||
| * | am 7c063cf9: Merge "There\'s no point in trying to continue to decode after a... | Andreas Huber | 2011-11-10 | 2 | -8/+11 |
| |\ | |||||
| | * | Merge "There's no point in trying to continue to decode after an error was si... | Andreas Huber | 2011-11-10 | 2 | -8/+11 |
| | |\ | |||||
| | | * | There's no point in trying to continue to decode after an error was signalled. | Andreas Huber | 2011-11-09 | 2 | -8/+11 |
* | | | | am 874641f1: am f2c2b1c4: am 19998120: Merge "Bug 5478024 drop after decode i... | Glenn Kasten | 2011-11-10 | 0 | -0/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | am f2c2b1c4: am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop... | Glenn Kasten | 2011-11-09 | 0 | -0/+0 |
| |\ \ \ | | |/ / | |||||
| | * | | am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into... | Glenn Kasten | 2011-11-09 | 1 | -1/+1 |
| | |\ \ | |||||
* | | \ \ | am db7d79e6: am 2b7f91b9: Merge "Fix regression for SoundPool playback" into ... | Eric Laurent | 2011-11-10 | 1 | -2/+7 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | am 2b7f91b9: Merge "Fix regression for SoundPool playback" into ics-mr1 | Eric Laurent | 2011-11-09 | 1 | -2/+7 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Fix regression for SoundPool playback | Eric Laurent | 2011-11-08 | 1 | -2/+7 |
| | | |/ | | |/| | |||||
* | | | | Merge "Instead of asserting, remove active streams if their sockets return fa... | Andreas Huber | 2011-11-09 | 1 | -15/+47 |
|\ \ \ \ | |||||
| * | | | | Instead of asserting, remove active streams if their sockets return failure | Andreas Huber | 2011-11-09 | 1 | -15/+47 |
* | | | | | am bb1b7d5c: am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop... | Glenn Kasten | 2011-11-09 | 1 | -1/+1 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into... | Glenn Kasten | 2011-11-09 | 1 | -1/+1 |
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/| | |||||
| | * | | Bug 5478024 drop after decode if can't drop before | Glenn Kasten | 2011-11-04 | 1 | -1/+1 |
* | | | | resolved conflicts for merge of 26f70db9 to master | Andreas Huber | 2011-11-08 | 18 | -76/+1 |
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | |||||
| * | | Merge "Remove surface legacy APIs and code." into ics-mr1 | Andreas Huber | 2011-11-08 | 18 | -76/+1 |
| |\ \ | |||||
| | * | | Remove surface legacy APIs and code. | Andreas Huber | 2011-10-28 | 18 | -76/+1 |
* | | | | am f3a892ab: Merge "AudioFlinger: mix track only when really ready" into ics-mr1 | Eric Laurent | 2011-11-08 | 1 | -1/+10 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge "AudioFlinger: mix track only when really ready" into ics-mr1 | Eric Laurent | 2011-11-08 | 1 | -1/+10 |
| |\ \ \ | |||||
| | * | | | AudioFlinger: mix track only when really ready | Eric Laurent | 2011-11-03 | 1 | -1/+10 |
* | | | | | am ee7ebb32: Merge "Fix a hang issue where the first frame can be dropped for... | James Dong | 2011-11-08 | 1 | -0/+6 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge "Fix a hang issue where the first frame can be dropped for timelapse vi... | James Dong | 2011-11-07 | 1 | -0/+6 |
| |\ \ \ \ | |||||
| | * | | | | Fix a hang issue where the first frame can be dropped for timelapse video rec... | James Dong | 2011-10-26 | 1 | -0/+6 |
* | | | | | | Merge "Use binary search to discover closest sync sample index, replace" | Andreas Huber | 2011-11-07 | 1 | -24/+25 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use binary search to discover closest sync sample index, replace | Andreas Huber | 2011-11-07 | 1 | -24/+25 |
* | | | | | | | Reconcile with ics-mr1-release | The Android Open Source Project | 2011-11-07 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-11-06 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-11-03 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-11-01 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | | | |||||
| | | | * | | | | | | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-10-30 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ | | | | | |_|_|_|/ / | | | | |/| | | | | | |||||
| | | | | * | | | | | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-10-27 | 0 | -0/+0 |
| | | | | |\ \ \ \ \ | | | | | | |_|_|/ / | | | | | |/| | | | | |||||
| | | | | | * | | | | merge in ics-release history after reset to master | The Android Automerger | 2011-10-20 | 0 | -0/+0 |
| | | | | | |\ \ \ \ | |||||
| | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-10-19 | 0 | -0/+0 |
| | | | | | | |\ \ \ \ | |||||
| | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-10-18 | 0 | -0/+0 |
| | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-10-16 | 0 | -0/+0 |
| | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-10-13 | 0 | -0/+0 |
| | | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-10-11 | 0 | -0/+0 |
| | | | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-10-09 | 0 | -0/+0 |
| | | | | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-10-06 | 0 | -0/+0 |
| | | | | | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-10-03 | 0 | -0/+0 |
| | | | | | | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-09-28 | 0 | -0/+0 |
| | | | | | | | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-09-28 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-09-27 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-09-25 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-09-22 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-09-21 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-09-20 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-09-18 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-09-15 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ |