Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH | Colin Cross | 2014-01-27 | 8 | -10/+10 |
* | Merge "Only increase the counter when we do take a wakelock" | Eric Laurent | 2014-01-27 | 1 | -5/+7 |
|\ | |||||
| * | Only increase the counter when we do take a wakelock | Jimmy Dalqvist | 2014-01-22 | 1 | -5/+7 |
* | | Merge "Do partial reads in MemoryLeakTrackUtil" | Eric Laurent | 2014-01-27 | 1 | -3/+11 |
|\ \ | |/ |/| | |||||
| * | Do partial reads in MemoryLeakTrackUtil | Oscar Rydhé | 2014-01-23 | 1 | -3/+11 |
|/ | |||||
* | Merge "Long mp3 metadata displays as corrupted file after transfer" | Marco Nelissen | 2014-01-17 | 3 | -18/+26 |
|\ | |||||
| * | Long mp3 metadata displays as corrupted file after transfer | Yin Liu | 2013-12-20 | 3 | -18/+26 |
* | | Merge "Added support for ID3v2 meta data in 3gp files" | Marco Nelissen | 2014-01-17 | 6 | -9/+91 |
|\ \ | |||||
| * | | Added support for ID3v2 meta data in 3gp files | Oscar Rydhé | 2014-01-16 | 6 | -9/+91 |
* | | | Merge "Fix compile error in NuPlayerRenderer debug print" | Marco Nelissen | 2014-01-17 | 1 | -1/+3 |
|\ \ \ | |/ / |/| | | |||||
| * | | Fix compile error in NuPlayerRenderer debug print | Oscar Rydhé | 2014-01-03 | 1 | -1/+3 |
* | | | Merge "Avoid jumps to faulty position after seeks" | Marco Nelissen | 2014-01-15 | 1 | -1/+4 |
|\ \ \ | |||||
| * | | | Avoid jumps to faulty position after seeks | Roger1 Jonsson | 2013-12-18 | 1 | -1/+4 |
| | |/ | |/| | |||||
* | | | Merge "libcameraservice: Fix build in ISO C++11 mode" | Eino-Ville Talvala | 2014-01-15 | 1 | -5/+5 |
|\ \ \ | |||||
| * | | | libcameraservice: Fix build in ISO C++11 mode | Bernhard Rosenkraenzer | 2013-07-30 | 1 | -5/+5 |
* | | | | Merge "Fix c++11 narrowing" | Nick Kralevich | 2014-01-11 | 4 | -8/+8 |
|\ \ \ \ | |||||
| * | | | | Fix c++11 narrowing | synergydev | 2013-10-25 | 4 | -8/+8 |
* | | | | | Merge "Frameworks: AudioFlinger: Fix effects memory leak" | Glenn Kasten | 2014-01-10 | 1 | -0/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Frameworks: AudioFlinger: Fix effects memory leak | Yu Yezhong | 2013-10-15 | 1 | -0/+8 |
* | | | | | | Merge "HLS: Fixed rounding error with decimal segment duration" | Marco Nelissen | 2014-01-09 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | HLS: Fixed rounding error with decimal segment duration | Oscar Rydhé | 2013-12-19 | 1 | -1/+1 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge "Change M4OSA_ERR_CREATE to return unsigned integer." | Narayan Kamath | 2014-01-08 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Change M4OSA_ERR_CREATE to return unsigned integer. | Ashok Bhat | 2014-01-02 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge "stagefright: do not offload LD-AAC decoding" | Eric Laurent | 2013-12-21 | 3 | -0/+15 |
|\ \ \ \ \ | |||||
| * | | | | | stagefright: do not offload LD-AAC decoding | Eric Laurent | 2013-12-21 | 3 | -0/+15 |
|/ / / / / | |||||
* | | | | | Merge "stagefright: fix offloading HE-AAC sampling rate." | Eric Laurent | 2013-12-21 | 1 | -17/+23 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | stagefright: fix offloading HE-AAC sampling rate. | Eric Laurent | 2013-12-19 | 1 | -17/+23 |
|/ / / / | |||||
* | | | | Merge "libeffects: do not use GNU old-style field designators" | Nick Kralevich | 2013-12-18 | 2 | -14/+14 |
|\ \ \ \ | |||||
| * | | | | libeffects: do not use GNU old-style field designators | synergy dev | 2013-12-17 | 2 | -14/+14 |
|/ / / / | |||||
* | | | | Merge "libstagefright: Delay release of wakelock in TimedEventQueue" | Eric Laurent | 2013-12-17 | 2 | -6/+9 |
|\ \ \ \ | |||||
| * | | | | libstagefright: Delay release of wakelock in TimedEventQueue | Haynes Mathew George | 2013-12-17 | 2 | -6/+9 |
|/ / / / | |||||
* | | | | Merge "audioflinger: check for condition before waiting" | Eric Laurent | 2013-12-17 | 1 | -1/+6 |
|\ \ \ \ | |||||
| * | | | | audioflinger: check for condition before waiting | Haynes Mathew George | 2013-12-17 | 1 | -1/+6 |
|/ / / / | |||||
* | | | | Merge "AudioTrack: fix position callback after restore" | Eric Laurent | 2013-12-17 | 1 | -1/+0 |
|\ \ \ \ | |||||
| * | | | | AudioTrack: fix position callback after restore | Eric Laurent | 2013-12-17 | 1 | -1/+0 |
|/ / / / | |||||
* | | | | Merge "update offloaded audio track sampling rate" | Eric Laurent | 2013-12-17 | 9 | -4/+53 |
|\ \ \ \ | |||||
| * | | | | update offloaded audio track sampling rate | Eric Laurent | 2013-12-17 | 9 | -4/+53 |
|/ / / / | |||||
* | | | | Merge "Increase kFastTrackMultiplier from 1 to 2" | Glenn Kasten | 2013-12-17 | 2 | -11/+14 |
|\ \ \ \ | |||||
| * | | | | Increase kFastTrackMultiplier from 1 to 2 | Glenn Kasten | 2013-12-04 | 2 | -11/+14 |
* | | | | | Merge changes Ia684fde5,I58fcb526 | Andy McFadden | 2013-12-11 | 5 | -14/+34 |
|\ \ \ \ \ | |||||
| * | | | | | Fix the help text | Andy McFadden | 2013-12-11 | 1 | -2/+2 |
| * | | | | | screenrecord fixes | Andy McFadden | 2013-12-11 | 5 | -12/+32 |
* | | | | | | Merge "Add "--bugreport" option to screenrecord" | Andy McFadden | 2013-12-11 | 12 | -99/+8473 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Add "--bugreport" option to screenrecord | Andy McFadden | 2013-12-11 | 12 | -99/+8473 |
|/ / / / / | |||||
* | | | | | Merge commit '2381f06f374ee0cb8bca0edf5388394432b00e6d' into HEAD | The Android Open Source Project | 2013-12-05 | 57 | -339/+1232 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | am 24605338: Merge "Fix metadata access" into klp-dev | Marco Nelissen | 2013-11-15 | 2 | -3/+9 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge "Fix metadata access" into klp-dev | Marco Nelissen | 2013-11-15 | 2 | -3/+9 |
| | |\ \ \ \ | |||||
| | | * | | | | Fix metadata access | Marco Nelissen | 2013-11-15 | 2 | -3/+9 |
| * | | | | | | am d7e59228: audioflinger: do not use raw pointer for tracks | Eric Laurent | 2013-11-15 | 2 | -8/+8 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | audioflinger: do not use raw pointer for tracks | Eric Laurent | 2013-11-15 | 2 | -8/+8 |