summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am eb76f318: am 96aed4fb: Merge "avcenc: Prepend startcodes to output buffers"Lajos Molnar2013-10-291-0/+6
|\
| * am 96aed4fb: Merge "avcenc: Prepend startcodes to output buffers"Lajos Molnar2013-10-291-0/+6
| |\
| | * Merge "avcenc: Prepend startcodes to output buffers"Lajos Molnar2013-10-291-0/+6
| | |\
| | | * avcenc: Prepend startcodes to output buffersMartin Storsjo2013-09-251-0/+6
* | | | am 1c594b63: Merge "audioflinger: enable effects after registration if needed...Eric Laurent2013-10-292-0/+3
|\ \ \ \
| * \ \ \ Merge "audioflinger: enable effects after registration if needed" into klp-devEric Laurent2013-10-302-0/+3
| |\ \ \ \
| | * | | | audioflinger: enable effects after registration if neededEric Laurent2013-10-122-0/+3
* | | | | | am fd477974: AudioFlinger: more fixes for offload audio lostEric Laurent2013-10-282-14/+26
|\ \ \ \ \ \ | |/ / / / /
| * | | | | AudioFlinger: more fixes for offload audio lostEric Laurent2013-10-282-14/+26
* | | | | | am 9cae2170: Assign blame for playback wakelocks.Marco Nelissen2013-10-2614-52/+171
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Assign blame for playback wakelocks.Marco Nelissen2013-10-2514-52/+171
* | | | | | am be567be3: Merge "Check for NULL buffer in repeat-latest" into klp-devAndy McFadden2013-10-241-0/+17
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Check for NULL buffer in repeat-latest" into klp-devAndy McFadden2013-10-241-0/+17
| |\ \ \ \ \
| | * | | | | Check for NULL buffer in repeat-latestAndy McFadden2013-10-231-0/+17
* | | | | | | am f3a6234b: Merge "Fix kAutoRampDurationUs overflow issue" into klp-devVineeta Srivastava2013-10-231-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Fix kAutoRampDurationUs overflow issue" into klp-devVineeta Srivastava2013-10-231-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fix kAutoRampDurationUs overflow issueVineeta Srivastava2013-10-181-2/+2
* | | | | | | am e7329bd5: am d5255d1d: Merge "If dlopen("libwvm.so") fails, log the reason...Elliott Hughes2013-10-231-1/+1
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | am d5255d1d: Merge "If dlopen("libwvm.so") fails, log the reason why."Elliott Hughes2013-10-231-1/+1
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge "If dlopen("libwvm.so") fails, log the reason why."Elliott Hughes2013-10-231-1/+1
| | |\ \ \ \ \
| | | * | | | | If dlopen("libwvm.so") fails, log the reason why.Elliott Hughes2013-10-231-1/+1
| | |/ / / / /
* | | | | | | am 9857473f: am 0f4b0d23: Merge "libeffects: do not use GNU old-style field d...Nick Kralevich2013-10-205-35/+35
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 0f4b0d23: Merge "libeffects: do not use GNU old-style field designators"Nick Kralevich2013-10-205-35/+35
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "libeffects: do not use GNU old-style field designators"Nick Kralevich2013-10-205-35/+35
| | |\ \ \ \ \
| | | * | | | | libeffects: do not use GNU old-style field designatorssynergydev2013-10-195-35/+35
| | |/ / / / /
* | | | | | | am 998c4e88: am 0219856e: Merge "libvideoeditor: fix M4OSA_Clock header guard"Nick Kralevich2013-10-181-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 0219856e: Merge "libvideoeditor: fix M4OSA_Clock header guard"Nick Kralevich2013-10-181-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "libvideoeditor: fix M4OSA_Clock header guard"Nick Kralevich2013-10-191-1/+1
| | |\ \ \ \ \
| | | * | | | | libvideoeditor: fix M4OSA_Clock header guardsynergydev2013-10-181-1/+1
| | |/ / / / /
* | | | | | | am 95c03858: Merge "Allow releaseBuffer after flush" into klp-devGlenn Kasten2013-10-183-6/+11
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge "Allow releaseBuffer after flush" into klp-devGlenn Kasten2013-10-183-6/+11
| |\ \ \ \ \ \
| | * | | | | | Allow releaseBuffer after flushGlenn Kasten2013-10-183-6/+11
| | | |_|/ / / | | |/| | | |
* | | | | | | am 6a51d7ed: audioflinger: fix track terminated before playingEric Laurent2013-10-182-13/+10
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | audioflinger: fix track terminated before playingEric Laurent2013-10-172-13/+10
| |/ / / / /
* | | | | | am dedc7b0f: Merge "Fix flush() followed by start()" into klp-devGlenn Kasten2013-10-171-0/+9
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fix flush() followed by start()" into klp-devGlenn Kasten2013-10-171-0/+9
| |\ \ \ \ \
| | * | | | | Fix flush() followed by start()Glenn Kasten2013-10-171-0/+9
* | | | | | | am 6fa20187: Make sure we get to discover that the cache is sufficiently full...Andreas Huber2013-10-171-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Make sure we get to discover that the cache is sufficiently full againAndreas Huber2013-10-171-1/+1
| |/ / / / /
* | | | | | am f8f15b05: Merge "Fix race condition in AudioTrack::pause followed by start...Glenn Kasten2013-10-162-7/+9
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fix race condition in AudioTrack::pause followed by start" into klp-devGlenn Kasten2013-10-172-7/+9
| |\ \ \ \ \
| | * | | | | Fix race condition in AudioTrack::pause followed by startGlenn Kasten2013-10-162-7/+9
* | | | | | | am 787c0d04: merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
| |\ \ \ \ \ \
| | * \ \ \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-10-150-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | merge in klp-release history after reset to klp-devThe Android Automerger2013-10-130-0/+0
| | | |\ \ \ \ \
| | | | * \ \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-10-130-0/+0
| | | | |\ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | |
| | | | | * | | | Camera: Skip AE precapture when possibleZhijun He2013-10-111-0/+12
| | | | | * | | | merge in klp-release history after reset to klp-devThe Android Automerger2013-10-100-0/+0
| | | | | |\ \ \ \
| | | | | | * \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-10-090-0/+0
| | | | | | |\ \ \ \