Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | am 085c4825: Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libvideoeditor_jn... | James Dong | 2012-06-12 | 2 | -0/+190 | |
| |\ \ | | |/ | ||||||
| | * | Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libvideoeditor_jni.so" into jb... | James Dong | 2012-06-12 | 2 | -0/+190 | |
| | |\ | ||||||
| | | * | Add NOTICE and MODULE_LICENSE_APACH2 to libvideoeditor_jni.so | James Dong | 2012-06-12 | 2 | -0/+190 | |
* | | | | am 0d637d6f: am 579ec308: Merge "MediaRouter work" into jb-dev | Adam Powell | 2012-06-12 | 1 | -11/+15 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | am 579ec308: Merge "MediaRouter work" into jb-dev | Adam Powell | 2012-06-12 | 1 | -11/+15 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Merge "MediaRouter work" into jb-dev | Adam Powell | 2012-06-12 | 1 | -11/+15 | |
| | |\ \ | ||||||
| | | * | | MediaRouter work | Adam Powell | 2012-06-12 | 1 | -11/+15 | |
* | | | | | am 2e1f18b9: am dcf33b73: Merge "Made IAudioService.setBluetoothA2dpOn() not ... | Eric Laurent | 2012-06-12 | 1 | -1/+1 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | am dcf33b73: Merge "Made IAudioService.setBluetoothA2dpOn() not oneway" into ... | Eric Laurent | 2012-06-12 | 1 | -1/+1 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | Merge "Made IAudioService.setBluetoothA2dpOn() not oneway" into jb-dev | Eric Laurent | 2012-06-12 | 1 | -1/+1 | |
| | |\ \ \ | | | |/ / | | |/| | | ||||||
| | | * | | Made IAudioService.setBluetoothA2dpOn() not oneway | Eric Laurent | 2012-06-11 | 1 | -1/+1 | |
| | | |/ | ||||||
* | | | | am 345a3835: am f958732b: Merge "Fix docs" into jb-dev | Adam Powell | 2012-06-12 | 1 | -2/+2 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | am f958732b: Merge "Fix docs" into jb-dev | Adam Powell | 2012-06-12 | 1 | -2/+2 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Fix docs | Adam Powell | 2012-06-11 | 1 | -2/+2 | |
* | | | | am a20d99b1: am ae20ae1a: More MediaRouter features. | Adam Powell | 2012-06-12 | 1 | -0/+67 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | am ae20ae1a: More MediaRouter features. | Adam Powell | 2012-06-12 | 1 | -0/+67 | |
| |\ \ \ | | |/ / | ||||||
| | * | | More MediaRouter features. | Adam Powell | 2012-06-11 | 1 | -0/+67 | |
| | |/ | ||||||
* | | | am 007f2b40: am f9d80b6b: Merge "Rework media router to be per-context with g... | Dianne Hackborn | 2012-06-12 | 1 | -158/+158 | |
|\ \ \ | |/ / | ||||||
| * | | am f9d80b6b: Merge "Rework media router to be per-context with global process... | Dianne Hackborn | 2012-06-12 | 1 | -158/+158 | |
| |\ \ | | |/ | ||||||
| | * | Rework media router to be per-context with global process state. | Dianne Hackborn | 2012-06-11 | 1 | -158/+158 | |
* | | | am bee681a1: am fbce66cb: Merge "Further work on MediaRouter" into jb-dev | Adam Powell | 2012-06-12 | 1 | -105/+125 | |
|\ \ \ | |/ / | ||||||
| * | | am fbce66cb: Merge "Further work on MediaRouter" into jb-dev | Adam Powell | 2012-06-12 | 1 | -105/+125 | |
| |\ \ | | |/ | ||||||
| | * | Further work on MediaRouter | Adam Powell | 2012-06-11 | 1 | -105/+125 | |
* | | | Merge "Bypass emulated storage for metadata extraction" | Marco Nelissen | 2012-06-08 | 1 | -4/+20 | |
|\ \ \ | ||||||
| * | | | Bypass emulated storage for metadata extraction | Marco Nelissen | 2012-06-08 | 1 | -4/+20 | |
* | | | | am 0237d04b: am 644e43e0: am 3e3d641c: Merge "Added mpga as valid MediaFile e... | Jean-Baptiste Queru | 2012-06-08 | 1 | -0/+1 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | am 644e43e0: am 3e3d641c: Merge "Added mpga as valid MediaFile extension" | Jean-Baptiste Queru | 2012-06-08 | 1 | -0/+1 | |
| |\ \ \ | | |_|/ | |/| | | ||||||
| | * | | am 3e3d641c: Merge "Added mpga as valid MediaFile extension" | Jean-Baptiste Queru | 2012-06-08 | 1 | -0/+1 | |
| | |\ \ | ||||||
| | | * | | Added mpga as valid MediaFile extension | Mathias Franzén | 2012-06-05 | 1 | -0/+1 | |
| | * | | | am 23cad6eb: Merge "stagefright aacenc: Fix reading out of bounds in pow2_xy" | Jean-Baptiste Queru | 2012-05-25 | 1 | -2/+2 | |
| | |\ \ \ | | | |/ / | ||||||
| | | * | | Merge "stagefright aacenc: Fix reading out of bounds in pow2_xy" | Jean-Baptiste Queru | 2012-05-25 | 1 | -2/+2 | |
| | | |\ \ | ||||||
| | | | * | | stagefright aacenc: Fix reading out of bounds in pow2_xy | Martin Storsjo | 2012-05-25 | 1 | -2/+2 | |
| | * | | | | am 55536138: Merge "libstagefright/matroska: Fix build with gcc 4.7" | Jean-Baptiste Queru | 2012-05-24 | 1 | -3/+3 | |
| | |\ \ \ \ | | | |/ / / | ||||||
| | | * | | | Merge "libstagefright/matroska: Fix build with gcc 4.7" | Jean-Baptiste Queru | 2012-05-24 | 1 | -3/+3 | |
| | | |\ \ \ | ||||||
| | | | * | | | libstagefright/matroska: Fix build with gcc 4.7 | Bernhard Rosenkraenzer | 2012-03-29 | 1 | -3/+3 | |
| | * | | | | | am 05cd296e: Merge "libmedia: Fix build with gcc 4.7" | Jean-Baptiste Queru | 2012-05-24 | 1 | -3/+3 | |
| | |\ \ \ \ \ | | | |/ / / / | ||||||
| | | * | | | | Merge "libmedia: Fix build with gcc 4.7" | Jean-Baptiste Queru | 2012-05-24 | 1 | -3/+3 | |
| | | |\ \ \ \ | | | | |/ / / | | | | | / / | | | | |/ / | | | |/| | | ||||||
| | | | * | | libmedia: Fix build with gcc 4.7 | Bernhard Rosenkraenzer | 2012-03-29 | 1 | -3/+3 | |
| | * | | | | am 64f77c5e: Merge "stagefright avcenc: Use intptr_t for casting pointers to ... | Jean-Baptiste Queru | 2012-05-21 | 3 | -9/+9 | |
| | |\ \ \ \ | | | |/ / / | ||||||
| | | * | | | Merge "stagefright avcenc: Use intptr_t for casting pointers to integers" | Jean-Baptiste Queru | 2012-05-21 | 3 | -9/+9 | |
| | | |\ \ \ | ||||||
| | | | * | | | stagefright avcenc: Use intptr_t for casting pointers to integers | Martin Storsjo | 2012-04-13 | 3 | -9/+9 | |
| | | | |/ / | ||||||
| | * | | | | am 6fd507b9: Merge "stagefright avcenc: Switch tmp variables to use the right... | Jean-Baptiste Queru | 2012-05-21 | 2 | -53/+50 | |
| | |\ \ \ \ | | | |/ / / | ||||||
| | | * | | | Merge "stagefright avcenc: Switch tmp variables to use the right type, to avo... | Jean-Baptiste Queru | 2012-05-21 | 2 | -53/+50 | |
| | | |\ \ \ | ||||||
| | | | * | | | stagefright avcenc: Switch tmp variables to use the right type, to avoid casting | Martin Storsjo | 2012-04-13 | 2 | -53/+50 | |
| | | | |/ / | ||||||
| | * | | | | am 00f94e88: Merge "Enable chromium http stack for x86" | Jean-Baptiste Queru | 2012-05-03 | 1 | -2/+4 | |
| | |\ \ \ \ | | | |/ / / | ||||||
| | | * | | | Enable chromium http stack for x86 | Jun Tian | 2012-05-02 | 1 | -2/+4 | |
| | * | | | | am 1b34c1bc: Merge "stagefright: Remove useless declarations" | Jean-Baptiste Queru | 2012-05-01 | 1 | -11/+0 | |
| | |\ \ \ \ | | | |/ / / | ||||||
| | | * | | | Merge "stagefright: Remove useless declarations" | Jean-Baptiste Queru | 2012-05-01 | 1 | -11/+0 | |
| | | |\ \ \ | ||||||
| | | | * | | | stagefright: Remove useless declarations | Martin Storsjo | 2012-04-16 | 1 | -11/+0 | |
| | | | |/ / | ||||||
* | | | | | | am 765d3d13: am fca9ff38: Merge "rename exif to exif_jni due to refactoring i... | Keun young Park | 2012-06-07 | 2 | -1/+4 | |
|\ \ \ \ \ \ | |/ / / / / |