Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | am 59b9dffe: (-s ours) am 362ebcbf: DO NOT MERGE Remove log spam for fast tra... | Glenn Kasten | 2012-06-14 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | / / / / / | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | am 362ebcbf: DO NOT MERGE Remove log spam for fast track denied | Glenn Kasten | 2012-06-14 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | DO NOT MERGE Remove log spam for fast track denied | Glenn Kasten | 2012-06-14 | 1 | -1/+1 | |
* | | | | | | | | am be8cf4a2: am 7b4de101: Merge "stagefright: set scaling mode for blank fram... | Jamie Gennis | 2012-06-14 | 1 | -0/+8 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | am 7b4de101: Merge "stagefright: set scaling mode for blank frames" into jb-dev | Jamie Gennis | 2012-06-14 | 1 | -0/+8 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | Merge "stagefright: set scaling mode for blank frames" into jb-dev | Jamie Gennis | 2012-06-14 | 1 | -0/+8 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | stagefright: set scaling mode for blank frames | Jamie Gennis | 2012-06-14 | 1 | -0/+8 | |
* | | | | | | | | | am 4ebbabda: am 192cbbad: Fix audio track pause. | Eric Laurent | 2012-06-14 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | / / / / / | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | am 192cbbad: Fix audio track pause. | Eric Laurent | 2012-06-14 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | Fix audio track pause. | Eric Laurent | 2012-06-14 | 1 | -0/+1 | |
| | |/ / / / / | ||||||
* | | | | | | | Camera2: Add more dump information, connect HAL device dump | Eino-Ville Talvala | 2012-06-14 | 3 | -29/+188 | |
* | | | | | | | am c3c044ab: am 82233b4b: Merge "Better handle invalid duration in Xing/VBRI ... | Marco Nelissen | 2012-06-14 | 2 | -7/+16 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | am 82233b4b: Merge "Better handle invalid duration in Xing/VBRI tags" into jb... | Marco Nelissen | 2012-06-14 | 2 | -7/+16 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | * | | | | | Merge "Better handle invalid duration in Xing/VBRI tags" into jb-dev | Marco Nelissen | 2012-06-14 | 2 | -7/+16 | |
| | |\ \ \ \ \ | ||||||
| | | * | | | | | Better handle invalid duration in Xing/VBRI tags | Marco Nelissen | 2012-06-13 | 2 | -7/+16 | |
| | | | |/ / / | | | |/| | | | ||||||
* | | | | | | | am ea1d16da: am e6adde40: Merge "Shorten dumpsys media.audio_flinger output" ... | Glenn Kasten | 2012-06-14 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | am e6adde40: Merge "Shorten dumpsys media.audio_flinger output" into jb-dev | Glenn Kasten | 2012-06-14 | 1 | -0/+4 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | * | | | | | Merge "Shorten dumpsys media.audio_flinger output" into jb-dev | Glenn Kasten | 2012-06-14 | 1 | -0/+4 | |
| | |\ \ \ \ \ | ||||||
| | | * | | | | | Shorten dumpsys media.audio_flinger output | Glenn Kasten | 2012-06-13 | 1 | -0/+4 | |
| | | |/ / / / | ||||||
* | | | | | | | am 48a0bfa6: am 49dd5cf3: Merge "Log track name on obtain/releaseBuffer warni... | Glenn Kasten | 2012-06-14 | 3 | -6/+6 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | am 49dd5cf3: Merge "Log track name on obtain/releaseBuffer warnings" into jb-dev | Glenn Kasten | 2012-06-14 | 3 | -6/+6 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | * | | | | | Merge "Log track name on obtain/releaseBuffer warnings" into jb-dev | Glenn Kasten | 2012-06-14 | 3 | -6/+6 | |
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | ||||||
| | | * | | | | Log track name on obtain/releaseBuffer warnings | Glenn Kasten | 2012-06-13 | 3 | -6/+6 | |
| | | |/ / / | ||||||
* | | | | | | am cc0df657: am e20435de: Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libs... | James Dong | 2012-06-14 | 110 | -0/+10450 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | am e20435de: Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libs build under ... | James Dong | 2012-06-13 | 110 | -0/+10450 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| | * | | | | Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/a... | James Dong | 2012-06-13 | 110 | -0/+10450 | |
| | |\ \ \ \ | ||||||
| | | * | | | | Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/ | James Dong | 2012-06-13 | 110 | -0/+10450 | |
| | | |/ / / | ||||||
* | | | | | | am 8fe9840b: am cac467b3: Merge "Fix one of the potential ANR issues from Awe... | James Dong | 2012-06-14 | 1 | -1/+7 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | am cac467b3: Merge "Fix one of the potential ANR issues from AwesomePlayer" i... | James Dong | 2012-06-13 | 1 | -1/+7 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| | * | | | | Merge "Fix one of the potential ANR issues from AwesomePlayer" into jb-dev | James Dong | 2012-06-13 | 1 | -1/+7 | |
| | |\ \ \ \ | | | |/ / / | | |/| | | | ||||||
| | | * | | | Fix one of the potential ANR issues from AwesomePlayer | James Dong | 2012-06-12 | 1 | -1/+7 | |
* | | | | | | Merge "Camera2: Improve error checking and debug logs." | Eino-Ville Talvala | 2012-06-14 | 3 | -14/+46 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Camera2: Improve error checking and debug logs. | Eino-Ville Talvala | 2012-06-13 | 3 | -14/+46 | |
* | | | | | | | Merge "Camera2: Still image support" | Eino-Ville Talvala | 2012-06-14 | 4 | -45/+458 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Camera2: Still image support | Eino-Ville Talvala | 2012-06-13 | 4 | -45/+458 | |
* | | | | | | | am 02bd2969: am b4ea1ab8: Merge "stagefright: fix AudioRecord callback buffer... | Eric Laurent | 2012-06-12 | 1 | -13/+33 | |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | am b4ea1ab8: Merge "stagefright: fix AudioRecord callback buffer size" into j... | Eric Laurent | 2012-06-12 | 1 | -13/+33 | |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | ||||||
| | * | | | | | Merge "stagefright: fix AudioRecord callback buffer size" into jb-dev | Eric Laurent | 2012-06-12 | 1 | -13/+33 | |
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | ||||||
| | | * | | | | stagefright: fix AudioRecord callback buffer size | Eric Laurent | 2012-06-12 | 1 | -13/+33 | |
* | | | | | | | am 92a6141e: am 958f463c: Add NOTICE and MODULE_LICENSE_APACHE2 for libstagef... | James Dong | 2012-06-12 | 4 | -0/+380 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | am 958f463c: Add NOTICE and MODULE_LICENSE_APACHE2 for libstagefright_soft_h2... | James Dong | 2012-06-12 | 4 | -0/+380 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | * | | | | | Add NOTICE and MODULE_LICENSE_APACHE2 for libstagefright_soft_h264dec and lib... | James Dong | 2012-06-12 | 4 | -0/+380 | |
* | | | | | | | am 2f2366fb: am bd961f4c: Merge "Add NOTICE and MODULE_LICENSE_APATCH2 to lib... | James Dong | 2012-06-12 | 14 | -0/+1330 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | am bd961f4c: Merge "Add NOTICE and MODULE_LICENSE_APATCH2 to libvideoeditor" ... | James Dong | 2012-06-12 | 14 | -0/+1330 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | * | | | | | Merge "Add NOTICE and MODULE_LICENSE_APATCH2 to libvideoeditor" into jb-dev | James Dong | 2012-06-12 | 14 | -0/+1330 | |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | ||||||
| | | * | | | | Add NOTICE and MODULE_LICENSE_APATCH2 to libvideoeditor | James Dong | 2012-06-12 | 14 | -0/+1330 | |
| | | | |/ / | | | |/| | | ||||||
* | | | | | | am 8f1dd6fd: am 10cf121f: Merge "Update make file" into jb-dev | Dave Burke | 2012-06-12 | 2 | -4/+2 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | am 10cf121f: Merge "Update make file" into jb-dev | Dave Burke | 2012-06-12 | 2 | -4/+2 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| | * | | | | Merge "Update make file" into jb-dev | Dave Burke | 2012-06-12 | 2 | -4/+2 | |
| | |\ \ \ \ | ||||||
| | | * | | | | Update make file | Dave Burke | 2012-06-12 | 2 | -4/+2 |