summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am e20435de: Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libs build under ...James Dong2012-06-13110-0/+10450
|\
| * Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/a...James Dong2012-06-13110-0/+10450
| |\
| | * Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/James Dong2012-06-13110-0/+10450
* | | am cac467b3: Merge "Fix one of the potential ANR issues from AwesomePlayer" i...James Dong2012-06-131-1/+7
|\ \ \ | |/ /
| * | Merge "Fix one of the potential ANR issues from AwesomePlayer" into jb-devJames Dong2012-06-131-1/+7
| |\ \ | | |/ | |/|
| | * Fix one of the potential ANR issues from AwesomePlayerJames Dong2012-06-121-1/+7
* | | am b4ea1ab8: Merge "stagefright: fix AudioRecord callback buffer size" into j...Eric Laurent2012-06-121-13/+33
|\ \ \ | |/ /
| * | Merge "stagefright: fix AudioRecord callback buffer size" into jb-devEric Laurent2012-06-121-13/+33
| |\ \ | | |/ | |/|
| | * stagefright: fix AudioRecord callback buffer sizeEric Laurent2012-06-121-13/+33
* | | am 958f463c: Add NOTICE and MODULE_LICENSE_APACHE2 for libstagefright_soft_h2...James Dong2012-06-124-0/+380
|\ \ \ | |/ /
| * | Add NOTICE and MODULE_LICENSE_APACHE2 for libstagefright_soft_h264dec and lib...James Dong2012-06-124-0/+380
* | | am bd961f4c: Merge "Add NOTICE and MODULE_LICENSE_APATCH2 to libvideoeditor" ...James Dong2012-06-1214-0/+1330
|\ \ \ | |/ /
| * | Merge "Add NOTICE and MODULE_LICENSE_APATCH2 to libvideoeditor" into jb-devJames Dong2012-06-1214-0/+1330
| |\ \ | | |/ | |/|
| | * Add NOTICE and MODULE_LICENSE_APATCH2 to libvideoeditorJames Dong2012-06-1214-0/+1330
* | | am 10cf121f: Merge "Update make file" into jb-devDave Burke2012-06-122-4/+2
|\ \ \ | |/ /
| * | Merge "Update make file" into jb-devDave Burke2012-06-122-4/+2
| |\ \
| | * | Update make fileDave Burke2012-06-122-4/+2
* | | | am b7706712: Merge "Fix gapless for deep buffers" into jb-devMarco Nelissen2012-06-121-0/+1
|\ \ \ \ | |/ / /
| * | | Merge "Fix gapless for deep buffers" into jb-devMarco Nelissen2012-06-121-0/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Fix gapless for deep buffersMarco Nelissen2012-06-111-0/+1
* | | | am 58c8db6b: Merge "Fix gapless playback" into jb-devMarco Nelissen2012-06-121-38/+47
|\ \ \ \ | |/ / /
| * | | Merge "Fix gapless playback" into jb-devMarco Nelissen2012-06-111-38/+47
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Fix gapless playbackMarco Nelissen2012-06-111-38/+47
* | | am 8a61dc02: Merge "Revert "Added some informational log messages to track do...James Dong2012-06-121-3/+2
|\ \ \ | |/ /
| * | Merge "Revert "Added some informational log messages to track down ANR relate...James Dong2012-06-111-3/+2
| |\ \ | | |/ | |/|
| | * Revert "Added some informational log messages to track down ANR related issues"James Dong2012-06-111-3/+2
* | | am c15d6657: Add audio watchdog threadGlenn Kasten2012-06-125-0/+264
|\ \ \ | |/ /
| * | Add audio watchdog threadGlenn Kasten2012-06-115-0/+264
| |/
* | stagefright aacenc: Move system headers before local headersMartin Storsjo2012-06-111-1/+4
* | Reconcile with jb-releaseThe Android Open Source Project2012-06-110-0/+0
|\ \
| * \ merge in jb-release history after reset to jb-devThe Android Automerger2012-06-110-0/+0
| |\ \ | | |/ | |/|
| | * Reduce underruns in screen off, esp. with EQGlenn Kasten2012-06-087-17/+91
| | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-080-0/+0
| | |\
* | | | stagefright aacenc: Add parentheses in expression with mixed && and ||Martin Storsjo2012-06-081-2/+2
* | | | am b7acdfb8: Merge "Fix green or corrupted video frames in the exported movie...James Dong2012-06-084-36/+89
|\ \ \ \ | |/ / /
| * | | Merge "Fix green or corrupted video frames in the exported movies" into jb-devJames Dong2012-06-084-36/+89
| |\ \ \
| | * | | Fix green or corrupted video frames in the exported moviesJames Dong2012-06-074-36/+89
* | | | | am 28ed2f93: Reduce underruns in screen off, esp. with EQGlenn Kasten2012-06-087-17/+91
|\ \ \ \ \ | |/ / / /
| * | | | Reduce underruns in screen off, esp. with EQGlenn Kasten2012-06-087-17/+91
| | |/ / | |/| |
* | | | am a4f7e0e9: audioflinger: fix duplicating thread standbyEric Laurent2012-06-071-9/+8
|\ \ \ \ | |/ / /
| * | | audioflinger: fix duplicating thread standbyEric Laurent2012-06-071-9/+8
* | | | am e35a55fb: Merge "Take latency and current time into account for visualizat...Marco Nelissen2012-06-073-34/+94
|\ \ \ \ | |/ / /
| * | | Merge "Take latency and current time into account for visualization" into jb-devMarco Nelissen2012-06-073-34/+94
| |\ \ \
| | * | | Take latency and current time into account for visualizationMarco Nelissen2012-06-073-34/+94
| | |/ /
* | | | am 9a0d82df: audioflinger: modify fast mixer overrun managementEric Laurent2012-06-071-1/+4
|\ \ \ \ | |/ / /
| * | | audioflinger: modify fast mixer overrun managementEric Laurent2012-06-061-1/+4
| |/ /
* | | Reconcile with jb-releaseThe Android Open Source Project2012-06-070-0/+0
|\ \ \ | | |/ | |/|
| * | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-060-0/+0
| |\ \ | | |/ | |/|
| | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-050-0/+0
| | |\
| | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-040-0/+0
| | | |\