summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 733cb79a: am 3cbfd10b: Merge "Partial fix for issue 3515250: video chat an...Eric Laurent2011-03-141-26/+22
|\
| * am 3cbfd10b: Merge "Partial fix for issue 3515250: video chat and SCO" into h...Eric Laurent2011-03-141-26/+22
| |\
| | * Merge "Partial fix for issue 3515250: video chat and SCO" into honeycomb-mr1Eric Laurent2011-03-141-26/+22
| | |\
| | | * Partial fix for issue 3515250: video chat and SCOEric Laurent2011-03-121-26/+22
* | | | am 2d24213f: am 3ec9d06f: Merge "MtpDevice: Handle zero length packets in rea...Mike Lockwood2011-03-141-0/+4
|\ \ \ \ | |/ / /
| * | | am 3ec9d06f: Merge "MtpDevice: Handle zero length packets in readResponse()" ...Mike Lockwood2011-03-141-0/+4
| |\ \ \ | | |/ /
| | * | MtpDevice: Handle zero length packets in readResponse()Mike Lockwood2011-03-141-0/+4
* | | | Merge "Fix PV AAC decoder crash due to out-of-boundary array access."James Dong2011-03-141-7/+25
|\ \ \ \
| * | | | Fix PV AAC decoder crash due to out-of-boundary array access.James Dong2011-03-141-7/+25
* | | | | am 0bea34fc: am dec0b755: Merge "MTP host: Fix problems reading large data pa...Mike Lockwood2011-03-141-3/+3
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am dec0b755: Merge "MTP host: Fix problems reading large data packets" into h...Mike Lockwood2011-03-141-3/+3
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | MTP host: Fix problems reading large data packetsMike Lockwood2011-03-121-3/+3
* | | | | am 3b473d95: am 9fffd9a8: Merge "USB: minor cleanup work" into honeycomb-mr1Mike Lockwood2011-03-112-2/+2
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | am 9fffd9a8: Merge "USB: minor cleanup work" into honeycomb-mr1Mike Lockwood2011-03-112-2/+2
| |\ \ \ | | |/ /
| | * | USB: minor cleanup workMike Lockwood2011-03-112-2/+2
| | |/
* | | Merge "If MP3 decoder output frame size were 0, media server would crash."James Dong2011-03-111-1/+9
|\ \ \
| * | | If MP3 decoder output frame size were 0, media server would crash.James Dong2011-03-111-1/+9
* | | | Merge "Remove unnecessary ld flags."Ying Wang2011-03-111-3/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Remove unnecessary ld flags.Ying Wang2011-03-111-3/+0
* | | | Merge "A little cleanup in MediaScanner JNI code"James Dong2011-03-111-89/+169
|\ \ \ \ | |/ / / |/| | |
| * | | A little cleanup in MediaScanner JNI codeJames Dong2011-03-111-89/+169
* | | | Remove unnecessary SkImageDecoder_libjpeg.cppChih-Wei Huang2011-03-111-5/+0
|/ / /
* | | am 75c95e9a: am 0eb7b697: Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into ho...Mike Lockwood2011-03-118-21/+28
|\ \ \ | |/ /
| * | am 0eb7b697: Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1Mike Lockwood2011-03-118-21/+28
| |\ \ | | |/
| | * Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1Mike Lockwood2011-03-118-21/+28
| | |\
| | | * Remove MtpClient class from framework and public APIMike Lockwood2011-03-117-9/+9
| | | * UsbDevice: Move IO related methods to new UsbDeviceConnection classMike Lockwood2011-03-112-12/+19
* | | | Only use ChromiumHTTPDataSource if webkit was built with chromium support.Andreas Huber2011-03-112-6/+53
* | | | am 055066e1: am 92f2f3ff: Merge "Bug 3012968 DRM output control" into honeyco...Glenn Kasten2011-03-112-0/+24
|\ \ \ \ | |/ / /
| * | | am 92f2f3ff: Merge "Bug 3012968 DRM output control" into honeycomb-mr1Glenn Kasten2011-03-112-0/+24
| |\ \ \ | | |/ /
| | * | Bug 3012968 DRM output controlGlenn Kasten2011-03-102-0/+24
| | |/
* | | Merge "Fix for bug 3477330 This patch fixs a crash bug caused by using a NULL...Gloria Wang2011-03-1011-28/+29
|\ \ \
| * | | Fix for bug 3477330Gloria Wang2011-03-1011-28/+29
* | | | am a4865ec7: am a7118e33: Merge "Fix for 4080402 NPE in Transition.setDuratio...Rajneesh Chowdury2011-03-102-7/+5
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | am a7118e33: Merge "Fix for 4080402 NPE in Transition.setDuration" into honey...Rajneesh Chowdury2011-03-102-7/+5
| |\ \ | | |/
| | * Merge "Fix for 4080402 NPE in Transition.setDuration" into honeycomb-mr1Rajneesh Chowdury2011-03-102-7/+5
| | |\
| | | * Fix for 4080402 NPE in Transition.setDurationRajneesh Chowdury2011-03-102-7/+5
* | | | am 18d8a074: am 564f12eb: Merge changes Ifd78cca3,Ieadb86fe,If5b44ebd into ho...Mike Lockwood2011-03-091-2/+2
|\ \ \ \ | |/ / /
| * | | am 564f12eb: Merge changes Ifd78cca3,Ieadb86fe,If5b44ebd into honeycomb-mr1Mike Lockwood2011-03-091-2/+2
| |\ \ \ | | |/ /
| | * | Merge changes Ifd78cca3,Ieadb86fe,If5b44ebd into honeycomb-mr1Mike Lockwood2011-03-091-2/+2
| | |\ \
| | | * | MTP: Convert date created and modified values from seconds to millisecondsMike Lockwood2011-03-091-2/+2
* | | | | Merge "Support http authentication ala http://foo:bar@host.org in stagefright."Andreas Huber2011-03-091-1/+2
|\ \ \ \ \
| * | | | | Support http authentication ala http://foo:bar@host.org in stagefright.Andreas Huber2011-03-091-1/+2
* | | | | | am d1e09e08: am 8df2477c: am bd0e806a: Support IPv6->IPv4 fallback in HTTP st...Lorenzo Colitti2011-03-091-14/+24
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 8df2477c: am bd0e806a: Support IPv6->IPv4 fallback in HTTP streaming.Lorenzo Colitti2011-03-091-14/+24
| |\ \ \ \ \
| | * \ \ \ \ am bd0e806a: Support IPv6->IPv4 fallback in HTTP streaming.Lorenzo Colitti2011-03-091-14/+24
| | |\ \ \ \ \
| | | * | | | | Support IPv6->IPv4 fallback in HTTP streaming.Lorenzo Colitti2011-03-081-14/+24
* | | | | | | | am d6aaec0c: am e4a02b61: am b9da16a1: Support IPv6 in HTTP streaming.Lorenzo Colitti2011-03-091-9/+17
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | / / / / | |_|_|/ / / / |/| | | | | |
| * | | | | | am e4a02b61: am b9da16a1: Support IPv6 in HTTP streaming.Lorenzo Colitti2011-03-091-9/+17
| |\ \ \ \ \ \ | | |/ / / / / | | | | / / / | | |_|/ / / | |/| | | |
| | * | | | am b9da16a1: Support IPv6 in HTTP streaming.Lorenzo Colitti2011-03-091-9/+17
| | |\ \ \ \ | | | |/ / /