summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | am 59b9dffe: (-s ours) am 362ebcbf: DO NOT MERGE Remove log spam for fast tra...Glenn Kasten2012-06-140-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | / / / / / | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | am 362ebcbf: DO NOT MERGE Remove log spam for fast track deniedGlenn Kasten2012-06-141-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | DO NOT MERGE Remove log spam for fast track deniedGlenn Kasten2012-06-141-1/+1
* | | | | | | | am be8cf4a2: am 7b4de101: Merge "stagefright: set scaling mode for blank fram...Jamie Gennis2012-06-141-0/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 7b4de101: Merge "stagefright: set scaling mode for blank frames" into jb-devJamie Gennis2012-06-141-0/+8
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "stagefright: set scaling mode for blank frames" into jb-devJamie Gennis2012-06-141-0/+8
| | |\ \ \ \ \ \
| | | * | | | | | stagefright: set scaling mode for blank framesJamie Gennis2012-06-141-0/+8
* | | | | | | | | am 4ebbabda: am 192cbbad: Fix audio track pause.Eric Laurent2012-06-141-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | / / / / / | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | am 192cbbad: Fix audio track pause.Eric Laurent2012-06-141-0/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Fix audio track pause.Eric Laurent2012-06-141-0/+1
| | |/ / / / /
* | | | | | | Camera2: Add more dump information, connect HAL device dumpEino-Ville Talvala2012-06-143-29/+188
* | | | | | | am c3c044ab: am 82233b4b: Merge "Better handle invalid duration in Xing/VBRI ...Marco Nelissen2012-06-142-7/+16
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 82233b4b: Merge "Better handle invalid duration in Xing/VBRI tags" into jb...Marco Nelissen2012-06-142-7/+16
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Better handle invalid duration in Xing/VBRI tags" into jb-devMarco Nelissen2012-06-142-7/+16
| | |\ \ \ \ \
| | | * | | | | Better handle invalid duration in Xing/VBRI tagsMarco Nelissen2012-06-132-7/+16
| | | | |/ / / | | | |/| | |
* | | | | | | am ea1d16da: am e6adde40: Merge "Shorten dumpsys media.audio_flinger output" ...Glenn Kasten2012-06-141-0/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am e6adde40: Merge "Shorten dumpsys media.audio_flinger output" into jb-devGlenn Kasten2012-06-141-0/+4
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Shorten dumpsys media.audio_flinger output" into jb-devGlenn Kasten2012-06-141-0/+4
| | |\ \ \ \ \
| | | * | | | | Shorten dumpsys media.audio_flinger outputGlenn Kasten2012-06-131-0/+4
| | | |/ / / /
* | | | | | | am 48a0bfa6: am 49dd5cf3: Merge "Log track name on obtain/releaseBuffer warni...Glenn Kasten2012-06-143-6/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 49dd5cf3: Merge "Log track name on obtain/releaseBuffer warnings" into jb-devGlenn Kasten2012-06-143-6/+6
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Log track name on obtain/releaseBuffer warnings" into jb-devGlenn Kasten2012-06-143-6/+6
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | Log track name on obtain/releaseBuffer warningsGlenn Kasten2012-06-133-6/+6
| | | |/ / /
* | | | | | am cc0df657: am e20435de: Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libs...James Dong2012-06-14110-0/+10450
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 8fe9840b: am cac467b3: Merge "Fix one of the potential ANR issues from Awe...James Dong2012-06-141-1/+7
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
* | | | | | Merge "Camera2: Improve error checking and debug logs."Eino-Ville Talvala2012-06-143-14/+46
|\ \ \ \ \ \
| * | | | | | Camera2: Improve error checking and debug logs.Eino-Ville Talvala2012-06-133-14/+46
* | | | | | | Merge "Camera2: Still image support"Eino-Ville Talvala2012-06-144-45/+458
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Camera2: Still image supportEino-Ville Talvala2012-06-134-45/+458
* | | | | | | am 02bd2969: am b4ea1ab8: Merge "stagefright: fix AudioRecord callback buffer...Eric Laurent2012-06-121-13/+33
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | 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 92a6141e: am 958f463c: Add NOTICE and MODULE_LICENSE_APACHE2 for libstagef...James Dong2012-06-124-0/+380
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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 2f2366fb: am bd961f4c: Merge "Add NOTICE and MODULE_LICENSE_APATCH2 to lib...James Dong2012-06-1214-0/+1330
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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 8f1dd6fd: am 10cf121f: Merge "Update make file" into jb-devDave Burke2012-06-122-4/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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