summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am c69bc40a: Merge "Cap pts gap between adjacent frames to specified value" i...Chong Zhang2014-03-136-6/+169
|\
| * Merge "Cap pts gap between adjacent frames to specified value" into klp-devChong Zhang2014-03-116-6/+169
| |\
| | * Cap pts gap between adjacent frames to specified valueChong Zhang2014-03-116-6/+169
* | | am 1c608ab3: save mGraphicBuffer pointer even when we\'re suspendedChong Zhang2014-03-131-0/+6
|\ \ \ | |/ /
| * | save mGraphicBuffer pointer even when we're suspendedChong Zhang2014-03-111-0/+6
| |/
* | am 19afb386: Merge "Remove streaming URI from default logs"Marco Nelissen2014-03-135-6/+5
|\ \
| * \ Merge "Remove streaming URI from default logs"Marco Nelissen2014-03-125-6/+5
| |\ \
| | * | Remove streaming URI from default logsDavid Williams2014-03-105-6/+5
| |/ /
* | | am 2ad7af29: Merge "Check for ARCH_ARM_HAVE_NEON flag only for ARM arch"Narayan Kamath2014-03-112-4/+7
|\ \ \ | |/ /
| * | Merge "Check for ARCH_ARM_HAVE_NEON flag only for ARM arch"Narayan Kamath2014-03-072-4/+7
| |\ \
| | * | Check for ARCH_ARM_HAVE_NEON flag only for ARM archAshok Bhat2014-03-032-4/+7
* | | | am a9b82160: Merge "LP64 fixes for media/libeffects"Narayan Kamath2014-03-1114-61/+62
|\ \ \ \ | |/ / /
| * | | Merge "LP64 fixes for media/libeffects"Narayan Kamath2014-03-0714-61/+62
| |\ \ \
| | * | | LP64 fixes for media/libeffectsAshok Bhat2014-02-2014-61/+62
* | | | | am 395c2fc0: Merge "audioflinger: Fix for a deadlock in track creation"Glenn Kasten2014-03-110-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge "audioflinger: Fix for a deadlock in track creation"Glenn Kasten2014-03-062-2/+5
| |\ \ \ \
| | * | | | audioflinger: Fix for a deadlock in track creationHaynes Mathew George2014-03-062-2/+5
| |/ / / /
* | | | | am 525b099a: Merge "Fix ALOGVs for 64bit"Narayan Kamath2014-03-112-4/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix ALOGVs for 64bit"Narayan Kamath2014-03-032-4/+4
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix ALOGVs for 64bitKévin PETIT2014-02-282-4/+4
* | | | | am 0cf16339: Merge "Fix preventing from heap overwrite in capture command"Glenn Kasten2014-03-111-34/+35
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix preventing from heap overwrite in capture command"Glenn Kasten2014-02-281-34/+35
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix preventing from heap overwrite in capture commandRyszard Grzesica2014-02-201-34/+35
| | |/ /
* | | | am 096d72a3: Merge "AArch64: Correction for LP64"Narayan Kamath2014-03-111-5/+5
|\ \ \ \ | |/ / /
| * | | Merge "AArch64: Correction for LP64"Narayan Kamath2014-02-271-5/+5
| |\ \ \
| | * | | AArch64: Correction for LP64Marcus Oakland2014-02-261-5/+5
* | | | | am 5969b408: Merge "Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH"Ying Wang2014-03-111-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH"Ying Wang2014-02-261-1/+2
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Use multilib-friendly LOCAL_MODULE_RELATIVE_PATHYing Wang2014-02-261-1/+2
| |/ / /
* | | | am 8fc4d57d: Merge "Avoid a building error"Glenn Kasten2014-03-111-1/+3
|\ \ \ \ | |/ / /
| * | | Merge "Avoid a building error"Glenn Kasten2014-02-251-1/+3
| |\ \ \
| | * | | Avoid a building errorChih-Wei Huang2013-01-101-1/+3
* | | | | am bc69c8ba: DO NOT MERGE: Camera: delete preview callback when preview size ...Zhijun He2014-03-101-0/+16
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | DO NOT MERGE: Camera: delete preview callback when preview size is changedZhijun He2014-03-101-0/+16
* | | | | am 6db20dcb: Merge "AudioTrack: When paused, return cached playback position"...Eric Laurent2014-03-082-3/+23
|\ \ \ \ \ | |/ / / /
| * | | | Merge "AudioTrack: When paused, return cached playback position" into klp-devEric Laurent2014-03-082-3/+23
| |\ \ \ \
| | * | | | AudioTrack: When paused, return cached playback positionHaynes Mathew George2014-03-062-3/+23
* | | | | | am 2f55c2c0: Merge "Simplify AudioTrack stream end and fix race" into klp-devGlenn Kasten2014-03-081-17/+15
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Simplify AudioTrack stream end and fix race" into klp-devGlenn Kasten2014-03-071-17/+15
| |\ \ \ \ \
| | * | | | | Simplify AudioTrack stream end and fix raceGlenn Kasten2014-03-071-17/+15
* | | | | | | am 5874615f: Allow for larger codec private dataMarco Nelissen2014-03-081-30/+50
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Allow for larger codec private dataMarco Nelissen2014-03-071-30/+50
| |/ / / / /
* | | | | | am 4ee5d2b9: (-s ours) Merge "LiveSession: Use the actual, possibly redirecte...Marco Nelissen2014-03-070-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge "LiveSession: Use the actual, possibly redirected url as base in the M3U"Marco Nelissen2014-02-202-4/+13
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | LiveSession: Use the actual, possibly redirected url as base in the M3UMartin Storsjo2014-01-102-4/+13
* | | | | | am 80b72e6f: Merge "libeffects: don\'t set module path"Colin Cross2014-03-071-1/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "libeffects: don't set module path"Colin Cross2014-02-141-1/+0
| |\ \ \ \ \
| | * | | | | libeffects: don't set module pathColin Cross2014-02-131-1/+0
| |/ / / / /
* | | | | | am 5bc83fc3: Merge "Fix SIGABRT when playing mp4 file" into klp-devMarco Nelissen2014-03-070-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge "Fix SIGABRT when playing mp4 file" into klp-devMarco Nelissen2014-03-071-0/+6
| |\ \ \ \ \