| Commit message (Expand) | Author | Age | Files | Lines |
* | am f8dad0b3: am afd01086: Merge "Further volume improvements." into ics-mr1 | Amith Yamasani | 2011-12-02 | 1 | -8/+2 |
|\ |
|
| * | Merge "Further volume improvements." into ics-mr1 | Amith Yamasani | 2011-12-02 | 1 | -8/+2 |
| |\ |
|
| | * | Further volume improvements. | Amith Yamasani | 2011-12-01 | 1 | -8/+2 |
* | | | am 5126f1d4: am 613ed4c6: Merge "Fixd for 5490443 Native crash while exportin... | Hong Teng | 2011-12-02 | 4 | -6/+51 |
|\ \ \
| |/ / |
|
| * | | Merge "Fixd for 5490443 Native crash while exporting a video - Add new onErro... | Hong Teng | 2011-12-02 | 4 | -6/+51 |
| |\ \ |
|
| | * | | Fixd for 5490443 Native crash while exporting a video | Hong Teng | 2011-12-01 | 4 | -6/+51 |
* | | | | Remove unused variable and imports in AudioManager | Jean-Michel Trivi | 2011-12-02 | 1 | -6/+0 |
* | | | | Merge "MTP: Add support for restricting PTP to only certain subdirectories of... | Mike Lockwood | 2011-12-02 | 2 | -42/+157 |
|\ \ \ \ |
|
| * | | | | MTP: Add support for restricting PTP to only certain subdirectories of the st... | Mike Lockwood | 2011-12-02 | 2 | -42/+157 |
* | | | | | Merge "MTP: Don't attempt to read more than 16K at a time from the MTP driver" | Mike Lockwood | 2011-12-02 | 1 | -2/+4 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | MTP: Don't attempt to read more than 16K at a time from the MTP driver | Mike Lockwood | 2011-12-01 | 1 | -2/+4 |
* | | | | | am 6cfa9e6c: am 0d3a2e93: Merge "AudioService: strengthen A2DP device detecti... | Eric Laurent | 2011-12-01 | 1 | -159/+239 |
|\ \ \ \ \
| |/ / / /
|/| / / /
| |/ / / |
|
| * | | | Merge "AudioService: strengthen A2DP device detection" into ics-mr1 | Eric Laurent | 2011-12-01 | 1 | -159/+239 |
| |\ \ \
| | |_|/
| |/| | |
|
| | * | | AudioService: strengthen A2DP device detection | Eric Laurent | 2011-11-30 | 1 | -159/+239 |
| | |/ |
|
* | | | Merge "Add README for media "automated" tests" | Glenn Kasten | 2011-12-01 | 1 | -0/+10 |
|\ \ \ |
|
| * | | | Add README for media "automated" tests | Glenn Kasten | 2011-12-01 | 1 | -0/+10 |
* | | | | am 10526a0b: am 2c2ed7be: Merge "Fixes a typo in AVIExtractor that would adve... | Andreas Huber | 2011-12-01 | 1 | -1/+1 |
|\ \ \ \
| |/ / /
|/| / /
| |/ / |
|
| * | | Fixes a typo in AVIExtractor that would advertise the wrong video dimensions | Andreas Huber | 2011-12-01 | 1 | -1/+1 |
* | | | am c040e1e7: am 6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bi... | Jamie Gennis | 2011-11-30 | 1 | -1/+1 |
|\ \ \
| |/ / |
|
| * | | Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1 | Jamie Gennis | 2011-11-29 | 1 | -1/+1 |
| |\ \ |
|
| | * | | SurfaceMediaSource: use the vid enc usage bit | Jamie Gennis | 2011-11-21 | 1 | -1/+1 |
* | | | | resolved conflicts for merge of 3d630e86 to master | Andreas Huber | 2011-11-30 | 2 | -2/+20 |
|\ \ \ \
| |/ / / |
|
| * | | | Merge "Make sure we can properly shutdown even if" into ics-mr1 | Andreas Huber | 2011-11-29 | 2 | -2/+20 |
| |\ \ \ |
|
| | * | | | Make sure we can properly shutdown even if | Andreas Huber | 2011-11-28 | 2 | -2/+20 |
| | | |/
| | |/| |
|
* | | | | Fix the broken build | James Dong | 2011-11-29 | 1 | -3/+3 |
* | | | | am 52607c53: am d12dc284: Merge "If an error occurs that prevents us from rea... | Andreas Huber | 2011-11-29 | 1 | -0/+32 |
|\ \ \ \
| |/ / / |
|
| * | | | Merge "If an error occurs that prevents us from reallocating buffers during a... | Andreas Huber | 2011-11-29 | 1 | -0/+32 |
| |\ \ \ |
|
| | * | | | If an error occurs that prevents us from reallocating buffers during a format... | Andreas Huber | 2011-11-28 | 1 | -0/+32 |
| | |/ / |
|
* | | | | am 074133b2: am 351143fb: Merge "Updated (internal) API for IStreamSource to ... | Andreas Huber | 2011-11-29 | 2 | -7/+12 |
|\ \ \ \
| |/ / / |
|
| * | | | Merge "Updated (internal) API for IStreamSource to signal discontinuities" in... | Andreas Huber | 2011-11-29 | 2 | -7/+12 |
| |\ \ \ |
|
| | * | | | Updated (internal) API for IStreamSource to signal discontinuities | Andreas Huber | 2011-11-29 | 2 | -7/+12 |
* | | | | | resolved conflicts for merge of 998a929a to master | Andreas Huber | 2011-11-29 | 7 | -60/+151 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | Merge "Finer granularity discontinuity support." into ics-mr1 | Andreas Huber | 2011-11-29 | 7 | -60/+151 |
| |\ \ \ \
| | |/ / /
| |/| | | |
|
| | * | | | Finer granularity discontinuity support. | Andreas Huber | 2011-11-28 | 7 | -60/+151 |
| | |/ / |
|
* | | | | Merge changes If4126023,Iacda2386,I1eb691f7,Ib56139f8 | Mathias Agopian | 2011-11-29 | 1 | -0/+2 |
|\ \ \ \ |
|
| * | | | | split ComposerService out of SurfaceComposerClient.h | Mathias Agopian | 2011-11-28 | 1 | -0/+2 |
* | | | | | am 77d1ebbd: am 4e5d3f2c: Merge "Add the min fps option to set the min fps in... | Yu Shan Emily Lau | 2011-11-28 | 3 | -65/+104 |
|\ \ \ \ \
| |/ / / /
|/| / / /
| |/ / / |
|
| * | | | Add the min fps option to set | Yu Shan Emily Lau | 2011-11-28 | 3 | -65/+104 |
| |/ / |
|
* | | | Merge "Fix a subtitle bug: multiple blank lines in SubRip(srt) file." | James Dong | 2011-11-22 | 1 | -6/+11 |
|\ \ \ |
|
| * | | | Fix a subtitle bug: multiple blank lines in SubRip(srt) file. | Insun Kang | 2011-11-22 | 1 | -6/+11 |
* | | | | am 4d592c59: am eabde3d4: am fe464a76: [Prime K] Fix gabage character issue | dujin.cha | 2011-11-22 | 1 | -0/+15 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | am fe464a76: [Prime K] Fix gabage character issue | dujin.cha | 2011-11-22 | 1 | -0/+15 |
| |\ \ \ |
|
| | * | | | [Prime K] Fix gabage character issue | dujin.cha | 2011-11-22 | 1 | -0/+15 |
* | | | | | am 31626b30: am cb6fbc89: Merge "Report a runtime error instead of asserting ... | Andreas Huber | 2011-11-22 | 1 | -57/+87 |
|\ \ \ \ \
| |/ / / /
| | | / /
| |_|/ /
|/| | | |
|
| * | | | Merge "Report a runtime error instead of asserting on malformed avc configura... | Andreas Huber | 2011-11-22 | 1 | -57/+87 |
| |\ \ \ |
|
| | * | | | Report a runtime error instead of asserting on malformed avc configuration data. | Andreas Huber | 2011-11-18 | 1 | -57/+87 |
* | | | | | am d0a25456: am 02740dc4: Merge "Fix log spamming during time lapse video rec... | James Dong | 2011-11-21 | 2 | -10/+15 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | Fix log spamming during time lapse video recording | James Dong | 2011-11-21 | 2 | -10/+15 |
| | |_|/
| |/| | |
|
| * | | | am d4b22ab4: status_t != bool | Marco Nelissen | 2011-11-18 | 2 | -3/+3 |
| |\ \ \
| | |/ /
| |/| /
| | |/ |
|
| | * | status_t != bool | Marco Nelissen | 2011-11-18 | 2 | -3/+3 |