summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "libeffects: do not use GNU old-style field designators"Nick Kralevich2013-12-182-14/+14
|\
| * libeffects: do not use GNU old-style field designatorssynergy dev2013-12-172-14/+14
|/
* Merge "libstagefright: Delay release of wakelock in TimedEventQueue"Eric Laurent2013-12-172-6/+9
|\
| * libstagefright: Delay release of wakelock in TimedEventQueueHaynes Mathew George2013-12-172-6/+9
|/
* Merge "audioflinger: check for condition before waiting"Eric Laurent2013-12-171-1/+6
|\
| * audioflinger: check for condition before waitingHaynes Mathew George2013-12-171-1/+6
|/
* Merge "AudioTrack: fix position callback after restore"Eric Laurent2013-12-171-1/+0
|\
| * AudioTrack: fix position callback after restoreEric Laurent2013-12-171-1/+0
|/
* Merge "update offloaded audio track sampling rate"Eric Laurent2013-12-179-4/+53
|\
| * update offloaded audio track sampling rateEric Laurent2013-12-179-4/+53
|/
* Merge "Increase kFastTrackMultiplier from 1 to 2"Glenn Kasten2013-12-172-11/+14
|\
| * Increase kFastTrackMultiplier from 1 to 2Glenn Kasten2013-12-042-11/+14
* | Merge changes Ia684fde5,I58fcb526Andy McFadden2013-12-115-14/+34
|\ \
| * | Fix the help textAndy McFadden2013-12-111-2/+2
| * | screenrecord fixesAndy McFadden2013-12-115-12/+32
* | | Merge "Add "--bugreport" option to screenrecord"Andy McFadden2013-12-1112-99/+8473
|\ \ \ | |/ /
| * | Add "--bugreport" option to screenrecordAndy McFadden2013-12-1112-99/+8473
|/ /
* | Merge commit '2381f06f374ee0cb8bca0edf5388394432b00e6d' into HEADThe Android Open Source Project2013-12-0557-339/+1232
|\ \ | |/ |/|
| * am 24605338: Merge "Fix metadata access" into klp-devMarco Nelissen2013-11-152-3/+9
| |\
| | * Merge "Fix metadata access" into klp-devMarco Nelissen2013-11-152-3/+9
| | |\
| | | * Fix metadata accessMarco Nelissen2013-11-152-3/+9
| * | | am d7e59228: audioflinger: do not use raw pointer for tracksEric Laurent2013-11-152-8/+8
| |\ \ \ | | |/ /
| | * | audioflinger: do not use raw pointer for tracksEric Laurent2013-11-152-8/+8
| * | | am 7dae71d6: Merge "AwesomePlayer: correct stream type for offload" into klp-devEric Laurent2013-11-156-5/+21
| |\ \ \ | | |/ /
| | * | Merge "AwesomePlayer: correct stream type for offload" into klp-devEric Laurent2013-11-156-5/+21
| | |\ \
| | | * | AwesomePlayer: correct stream type for offloadEric Laurent2013-11-146-5/+21
| | | |/
| * | | am d8a62e25: Camera2: Rework the FPS range vs. FPS single setting detectionEino-Ville Talvala2013-11-142-33/+20
| |\ \ \ | | |/ /
| | * | Camera2: Rework the FPS range vs. FPS single setting detectionEino-Ville Talvala2013-11-142-33/+20
| | |/
| * | am 4215e616: Merge "audioflinger: fix offload track transition" into klp-devEric Laurent2013-11-141-17/+24
| |\ \ | | |/
| | * Merge "audioflinger: fix offload track transition" into klp-devEric Laurent2013-11-141-17/+24
| | |\
| | | * audioflinger: fix offload track transitionEric Laurent2013-11-121-17/+24
| * | | am 9f357f31: Merge "audioflinger: fix offload resume after drain" into klp-devEric Laurent2013-11-141-5/+9
| |\ \ \ | | |/ /
| | * | Merge "audioflinger: fix offload resume after drain" into klp-devEric Laurent2013-11-141-5/+9
| | |\ \ | | | |/
| | | * audioflinger: fix offload resume after drainEric Laurent2013-11-121-5/+9
| * | | am 92092b39: Merge "stagefright: limit default max-input-size for AVC" into k...Lajos Molnar2013-11-131-7/+18
| |\ \ \ | | |/ /
| | * | Merge "stagefright: limit default max-input-size for AVC" into klp-devLajos Molnar2013-11-131-7/+18
| | |\ \
| | | * | stagefright: limit default max-input-size for AVCLajos Molnar2013-11-131-7/+18
| * | | | am 069bcc50: Merge "AwesomePlayer: Improve performance on high-fps clips" int...Lajos Molnar2013-11-131-1/+36
| |\ \ \ \ | | |/ / /
| | * | | Merge "AwesomePlayer: Improve performance on high-fps clips" into klp-devLajos Molnar2013-11-131-1/+36
| | |\ \ \ | | | |/ / | | |/| |
| | | * | AwesomePlayer: Improve performance on high-fps clipsLajos Molnar2013-11-121-1/+36
| | | |/
| * | | am 5595f6de: Merge "Only initialize sniffers once, don\'t hold mutex while sn...Marco Nelissen2013-11-132-17/+30
| |\ \ \ | | |/ /
| | * | Merge "Only initialize sniffers once, don't hold mutex while sniffing" into k...Marco Nelissen2013-11-132-17/+30
| | |\ \
| | | * | Only initialize sniffers once, don't hold mutex while sniffingMarco Nelissen2013-11-112-17/+30
| * | | | am 26c8f714: Merge "Ignore transport stream packets with the "transport_error...Andreas Huber2013-11-131-1/+4
| |\ \ \ \ | | |/ / /
| | * | | Merge "Ignore transport stream packets with the "transport_error_indicator" b...Andreas Huber2013-11-131-1/+4
| | |\ \ \
| | | * | | Ignore transport stream packets with the "transport_error_indicator" bit setAndreas Huber2013-11-121-1/+4
| | | |/ /
| * | | | am 56477eb7: am 27ae268a: am 00cb884f: Merge "StageFright: Removes hacks for ...Adam Hampson2013-11-132-9/+2
| |\ \ \ \ | | |/ / /
| | * | | am 27ae268a: am 00cb884f: Merge "StageFright: Removes hacks for Nvidia MPEG2 ...Adam Hampson2013-11-132-9/+2
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | am 00cb884f: Merge "StageFright: Removes hacks for Nvidia MPEG2 decoder" into...Adam Hampson2013-11-132-9/+2
| | | |\ \
| | | | * \ Merge "StageFright: Removes hacks for Nvidia MPEG2 decoder" into jb-mr2-devAdam Hampson2013-11-132-9/+2
| | | | |\ \