summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge "Only increase the counter when we do take a wakelock"Eric Laurent2014-01-271-5/+7
|\ \ \ \ \
| * | | | | Only increase the counter when we do take a wakelockJimmy Dalqvist2014-01-221-5/+7
* | | | | | Merge "Do partial reads in MemoryLeakTrackUtil"Eric Laurent2014-01-271-3/+11
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Do partial reads in MemoryLeakTrackUtilOscar Rydhé2014-01-231-3/+11
|/ / / / /
* | | | | Merge "Long mp3 metadata displays as corrupted file after transfer"Marco Nelissen2014-01-173-18/+26
|\ \ \ \ \
| * | | | | Long mp3 metadata displays as corrupted file after transferYin Liu2013-12-203-18/+26
* | | | | | Merge "Added support for ID3v2 meta data in 3gp files"Marco Nelissen2014-01-176-9/+91
|\ \ \ \ \ \
| * | | | | | Added support for ID3v2 meta data in 3gp filesOscar Rydhé2014-01-166-9/+91
* | | | | | | Merge "Fix compile error in NuPlayerRenderer debug print"Marco Nelissen2014-01-171-1/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix compile error in NuPlayerRenderer debug printOscar Rydhé2014-01-031-1/+3
* | | | | | | Merge "Avoid jumps to faulty position after seeks"Marco Nelissen2014-01-151-1/+4
|\ \ \ \ \ \ \
| * | | | | | | Avoid jumps to faulty position after seeksRoger1 Jonsson2013-12-181-1/+4
| | |/ / / / / | |/| | | | |
* | | | | | | Merge "libcameraservice: Fix build in ISO C++11 mode"Eino-Ville Talvala2014-01-151-5/+5
|\ \ \ \ \ \ \
| * | | | | | | libcameraservice: Fix build in ISO C++11 modeBernhard Rosenkraenzer2013-07-301-5/+5
* | | | | | | | Merge "Fix c++11 narrowing"Nick Kralevich2014-01-114-8/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix c++11 narrowingsynergydev2013-10-254-8/+8
* | | | | | | | | Merge "Frameworks: AudioFlinger: Fix effects memory leak"Glenn Kasten2014-01-101-0/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Frameworks: AudioFlinger: Fix effects memory leakYu Yezhong2013-10-151-0/+8
* | | | | | | | | | Merge "HLS: Fixed rounding error with decimal segment duration"Marco Nelissen2014-01-091-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | HLS: Fixed rounding error with decimal segment durationOscar Rydhé2013-12-191-1/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge "Change M4OSA_ERR_CREATE to return unsigned integer."Narayan Kamath2014-01-081-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Change M4OSA_ERR_CREATE to return unsigned integer.Ashok Bhat2014-01-021-1/+1
|/ / / / / / / /
* | | | | | | | Merge "stagefright: do not offload LD-AAC decoding"Eric Laurent2013-12-213-0/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | stagefright: do not offload LD-AAC decodingEric Laurent2013-12-213-0/+15
|/ / / / / / / /
* | | | | | | | Merge "stagefright: fix offloading HE-AAC sampling rate."Eric Laurent2013-12-211-17/+23
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | stagefright: fix offloading HE-AAC sampling rate.Eric Laurent2013-12-191-17/+23
|/ / / / / / /
* | | | | | | 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
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /