summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
...
| * | am 085c4825: Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libvideoeditor_jn...James Dong2012-06-122-0/+190
| |\ \ | | |/
| | * Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libvideoeditor_jni.so" into jb...James Dong2012-06-122-0/+190
| | |\
| | | * Add NOTICE and MODULE_LICENSE_APACH2 to libvideoeditor_jni.soJames Dong2012-06-122-0/+190
* | | | am 0d637d6f: am 579ec308: Merge "MediaRouter work" into jb-devAdam Powell2012-06-121-11/+15
|\ \ \ \ | |/ / /
| * | | am 579ec308: Merge "MediaRouter work" into jb-devAdam Powell2012-06-121-11/+15
| |\ \ \ | | |/ /
| | * | Merge "MediaRouter work" into jb-devAdam Powell2012-06-121-11/+15
| | |\ \
| | | * | MediaRouter workAdam Powell2012-06-121-11/+15
* | | | | am 2e1f18b9: am dcf33b73: Merge "Made IAudioService.setBluetoothA2dpOn() not ...Eric Laurent2012-06-121-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am dcf33b73: Merge "Made IAudioService.setBluetoothA2dpOn() not oneway" into ...Eric Laurent2012-06-121-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge "Made IAudioService.setBluetoothA2dpOn() not oneway" into jb-devEric Laurent2012-06-121-1/+1
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Made IAudioService.setBluetoothA2dpOn() not onewayEric Laurent2012-06-111-1/+1
| | | |/
* | | | am 345a3835: am f958732b: Merge "Fix docs" into jb-devAdam Powell2012-06-121-2/+2
|\ \ \ \ | |/ / /
| * | | am f958732b: Merge "Fix docs" into jb-devAdam Powell2012-06-121-2/+2
| |\ \ \ | | |/ /
| | * | Fix docsAdam Powell2012-06-111-2/+2
* | | | am a20d99b1: am ae20ae1a: More MediaRouter features.Adam Powell2012-06-121-0/+67
|\ \ \ \ | |/ / /
| * | | am ae20ae1a: More MediaRouter features.Adam Powell2012-06-121-0/+67
| |\ \ \ | | |/ /
| | * | More MediaRouter features.Adam Powell2012-06-111-0/+67
| | |/
* | | am 007f2b40: am f9d80b6b: Merge "Rework media router to be per-context with g...Dianne Hackborn2012-06-121-158/+158
|\ \ \ | |/ /
| * | am f9d80b6b: Merge "Rework media router to be per-context with global process...Dianne Hackborn2012-06-121-158/+158
| |\ \ | | |/
| | * Rework media router to be per-context with global process state.Dianne Hackborn2012-06-111-158/+158
* | | am bee681a1: am fbce66cb: Merge "Further work on MediaRouter" into jb-devAdam Powell2012-06-121-105/+125
|\ \ \ | |/ /
| * | am fbce66cb: Merge "Further work on MediaRouter" into jb-devAdam Powell2012-06-121-105/+125
| |\ \ | | |/
| | * Further work on MediaRouterAdam Powell2012-06-111-105/+125
* | | Merge "Bypass emulated storage for metadata extraction"Marco Nelissen2012-06-081-4/+20
|\ \ \
| * | | Bypass emulated storage for metadata extractionMarco Nelissen2012-06-081-4/+20
* | | | am 0237d04b: am 644e43e0: am 3e3d641c: Merge "Added mpga as valid MediaFile e...Jean-Baptiste Queru2012-06-081-0/+1
|\ \ \ \ | | |/ / | |/| |
| * | | am 644e43e0: am 3e3d641c: Merge "Added mpga as valid MediaFile extension"Jean-Baptiste Queru2012-06-081-0/+1
| |\ \ \ | | |_|/ | |/| |
| | * | am 3e3d641c: Merge "Added mpga as valid MediaFile extension"Jean-Baptiste Queru2012-06-081-0/+1
| | |\ \
| | | * | Added mpga as valid MediaFile extensionMathias Franzén2012-06-051-0/+1
| | * | | am 23cad6eb: Merge "stagefright aacenc: Fix reading out of bounds in pow2_xy"Jean-Baptiste Queru2012-05-251-2/+2
| | |\ \ \ | | | |/ /
| | | * | Merge "stagefright aacenc: Fix reading out of bounds in pow2_xy"Jean-Baptiste Queru2012-05-251-2/+2
| | | |\ \
| | | | * | stagefright aacenc: Fix reading out of bounds in pow2_xyMartin Storsjo2012-05-251-2/+2
| | * | | | am 55536138: Merge "libstagefright/matroska: Fix build with gcc 4.7"Jean-Baptiste Queru2012-05-241-3/+3
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "libstagefright/matroska: Fix build with gcc 4.7"Jean-Baptiste Queru2012-05-241-3/+3
| | | |\ \ \
| | | | * | | libstagefright/matroska: Fix build with gcc 4.7Bernhard Rosenkraenzer2012-03-291-3/+3
| | * | | | | am 05cd296e: Merge "libmedia: Fix build with gcc 4.7"Jean-Baptiste Queru2012-05-241-3/+3
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "libmedia: Fix build with gcc 4.7"Jean-Baptiste Queru2012-05-241-3/+3
| | | |\ \ \ \ | | | | |/ / / | | | | | / / | | | | |/ / | | | |/| |
| | | | * | libmedia: Fix build with gcc 4.7Bernhard Rosenkraenzer2012-03-291-3/+3
| | * | | | am 64f77c5e: Merge "stagefright avcenc: Use intptr_t for casting pointers to ...Jean-Baptiste Queru2012-05-213-9/+9
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "stagefright avcenc: Use intptr_t for casting pointers to integers"Jean-Baptiste Queru2012-05-213-9/+9
| | | |\ \ \
| | | | * | | stagefright avcenc: Use intptr_t for casting pointers to integersMartin Storsjo2012-04-133-9/+9
| | | | |/ /
| | * | | | am 6fd507b9: Merge "stagefright avcenc: Switch tmp variables to use the right...Jean-Baptiste Queru2012-05-212-53/+50
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "stagefright avcenc: Switch tmp variables to use the right type, to avo...Jean-Baptiste Queru2012-05-212-53/+50
| | | |\ \ \
| | | | * | | stagefright avcenc: Switch tmp variables to use the right type, to avoid castingMartin Storsjo2012-04-132-53/+50
| | | | |/ /
| | * | | | am 00f94e88: Merge "Enable chromium http stack for x86"Jean-Baptiste Queru2012-05-031-2/+4
| | |\ \ \ \ | | | |/ / /
| | | * | | Enable chromium http stack for x86Jun Tian2012-05-021-2/+4
| | * | | | am 1b34c1bc: Merge "stagefright: Remove useless declarations"Jean-Baptiste Queru2012-05-011-11/+0
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "stagefright: Remove useless declarations"Jean-Baptiste Queru2012-05-011-11/+0
| | | |\ \ \
| | | | * | | stagefright: Remove useless declarationsMartin Storsjo2012-04-161-11/+0
| | | | |/ /
* | | | | | am 765d3d13: am fca9ff38: Merge "rename exif to exif_jni due to refactoring i...Keun young Park2012-06-072-1/+4
|\ \ \ \ \ \ | |/ / / / /