summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am ec04f4ac: am 7c063cf9: Merge "There\'s no point in trying to continue to d...Andreas Huber2011-11-102-8/+11
|\
| * am 7c063cf9: Merge "There\'s no point in trying to continue to decode after a...Andreas Huber2011-11-102-8/+11
| |\
| | * Merge "There's no point in trying to continue to decode after an error was si...Andreas Huber2011-11-102-8/+11
| | |\
| | | * There's no point in trying to continue to decode after an error was signalled.Andreas Huber2011-11-092-8/+11
* | | | am 874641f1: am f2c2b1c4: am 19998120: Merge "Bug 5478024 drop after decode i...Glenn Kasten2011-11-100-0/+0
|\ \ \ \ | |/ / /
| * | | am f2c2b1c4: am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop...Glenn Kasten2011-11-090-0/+0
| |\ \ \ | | |/ /
| | * | am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into...Glenn Kasten2011-11-091-1/+1
| | |\ \
* | | \ \ am db7d79e6: am 2b7f91b9: Merge "Fix regression for SoundPool playback" into ...Eric Laurent2011-11-101-2/+7
|\ \ \ \ \ | |/ / / /
| * | | | am 2b7f91b9: Merge "Fix regression for SoundPool playback" into ics-mr1Eric Laurent2011-11-091-2/+7
| |\ \ \ \ | | |/ / /
| | * | | Fix regression for SoundPool playbackEric Laurent2011-11-081-2/+7
| | | |/ | | |/|
* | | | Merge "Instead of asserting, remove active streams if their sockets return fa...Andreas Huber2011-11-091-15/+47
|\ \ \ \
| * | | | Instead of asserting, remove active streams if their sockets return failureAndreas Huber2011-11-091-15/+47
* | | | | am bb1b7d5c: am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop...Glenn Kasten2011-11-091-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into...Glenn Kasten2011-11-091-1/+1
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | Bug 5478024 drop after decode if can't drop beforeGlenn Kasten2011-11-041-1/+1
* | | | resolved conflicts for merge of 26f70db9 to masterAndreas Huber2011-11-0818-76/+1
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Merge "Remove surface legacy APIs and code." into ics-mr1Andreas Huber2011-11-0818-76/+1
| |\ \
| | * | Remove surface legacy APIs and code.Andreas Huber2011-10-2818-76/+1
* | | | am f3a892ab: Merge "AudioFlinger: mix track only when really ready" into ics-mr1Eric Laurent2011-11-081-1/+10
|\ \ \ \ | |/ / /
| * | | Merge "AudioFlinger: mix track only when really ready" into ics-mr1Eric Laurent2011-11-081-1/+10
| |\ \ \
| | * | | AudioFlinger: mix track only when really readyEric Laurent2011-11-031-1/+10
* | | | | am ee7ebb32: Merge "Fix a hang issue where the first frame can be dropped for...James Dong2011-11-081-0/+6
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix a hang issue where the first frame can be dropped for timelapse vi...James Dong2011-11-071-0/+6
| |\ \ \ \
| | * | | | Fix a hang issue where the first frame can be dropped for timelapse video rec...James Dong2011-10-261-0/+6
* | | | | | Merge "Use binary search to discover closest sync sample index, replace"Andreas Huber2011-11-071-24/+25
|\ \ \ \ \ \
| * | | | | | Use binary search to discover closest sync sample index, replaceAndreas Huber2011-11-071-24/+25
* | | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-11-070-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-060-0/+0
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-030-0/+0
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-010-0/+0
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
| | | | * | | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-10-300-0/+0
| | | | |\ \ \ \ \ \ | | | | | |_|_|_|/ / | | | | |/| | | | |
| | | | | * | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-10-270-0/+0
| | | | | |\ \ \ \ \ | | | | | | |_|_|/ / | | | | | |/| | | |
| | | | | | * | | | merge in ics-release history after reset to masterThe Android Automerger2011-10-200-0/+0
| | | | | | |\ \ \ \
| | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-190-0/+0
| | | | | | | |\ \ \ \
| | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-180-0/+0
| | | | | | | | |\ \ \ \
| | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-160-0/+0
| | | | | | | | | |\ \ \ \
| | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-130-0/+0
| | | | | | | | | | |\ \ \ \
| | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-110-0/+0
| | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-090-0/+0
| | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-060-0/+0
| | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-030-0/+0
| | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-280-0/+0
| | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-280-0/+0
| | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-270-0/+0
| | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-250-0/+0
| | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-220-0/+0
| | | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-210-0/+0
| | | | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-200-0/+0
| | | | | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-180-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-150-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \