Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 6bf7c5cf: Merge "Clean up test makefiles." | Dan Albert | 2014-09-12 | 3 | -50/+3 |
|\ | |||||
| * | Merge "Clean up test makefiles." | Dan Albert | 2014-09-11 | 3 | -50/+3 |
| |\ | |||||
| | * | Clean up test makefiles. | Dan Albert | 2014-09-11 | 3 | -50/+3 |
* | | | am 2b16391d: Merge "Add test for AMR-NB decoder" | Glenn Kasten | 2014-09-11 | 2 | -0/+170 |
|\ \ \ | |/ / | |||||
| * | | Merge "Add test for AMR-NB decoder" | Glenn Kasten | 2014-09-11 | 2 | -0/+170 |
| |\ \ | |||||
| | * | | Add test for AMR-NB decoder | Ashok Bhat | 2014-06-16 | 2 | -0/+170 |
* | | | | am a9151741: Merge "Fix inline assembly for clang" | Glenn Kasten | 2014-09-11 | 0 | -0/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge "Fix inline assembly for clang" | Glenn Kasten | 2014-09-11 | 0 | -0/+0 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | Fix inline assembly for clang | Bernhard Rosenkränzer | 2013-12-13 | 1 | -2/+2 |
* | | | | am 032ecb7f: Merge "Fix in SoftAVCEncoder plugin" | Narayan Kamath | 2014-09-04 | 1 | -3/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge "Fix in SoftAVCEncoder plugin" | Narayan Kamath | 2014-09-04 | 1 | -3/+4 |
| |\ \ \ | |||||
| | * | | | Fix in SoftAVCEncoder plugin | Ashok Bhat | 2014-07-09 | 1 | -3/+4 |
* | | | | | am 45d2c7e1: Merge "Move chromium_http/support.cpp off androidGetTid." | Elliott Hughes | 2014-08-18 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge "Move chromium_http/support.cpp off androidGetTid." | Elliott Hughes | 2014-08-16 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | Move chromium_http/support.cpp off androidGetTid. | Elliott Hughes | 2014-08-18 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | am d29b4f65: Merge "Use gettid directly." | Elliott Hughes | 2014-08-18 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge "Use gettid directly." | Elliott Hughes | 2014-08-16 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | Use gettid directly. | Elliott Hughes | 2014-08-18 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | am 5a192121: Merge "Revert "Fix build after side-stepping global -Bsymbolic."" | Dan Albert | 2014-08-08 | 3 | -25/+0 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge "Revert "Fix build after side-stepping global -Bsymbolic."" | Dan Albert | 2014-08-07 | 3 | -25/+0 |
| |\ \ \ \ | |||||
| | * | | | | Revert "Fix build after side-stepping global -Bsymbolic." | Dan Albert | 2014-08-08 | 3 | -25/+0 |
* | | | | | | am 9ee1572f: Merge "Fix PIC relocations for non-Bsymbolic builds" | Dan Albert | 2014-08-08 | 7 | -0/+29 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge "Fix PIC relocations for non-Bsymbolic builds" | Dan Albert | 2014-08-07 | 7 | -0/+29 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Fix PIC relocations for non-Bsymbolic builds | Ard Biesheuvel | 2014-08-08 | 7 | -0/+29 |
* | | | | | | am 07574544: Merge "Fix build after side-stepping global -Bsymbolic." | Dan Albert | 2014-08-07 | 3 | -0/+25 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge "Fix build after side-stepping global -Bsymbolic." | Dan Albert | 2014-08-07 | 3 | -0/+25 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Fix build after side-stepping global -Bsymbolic. | Dan Albert | 2014-08-07 | 3 | -0/+25 |
| |/ / / / | |||||
* | | | | | am a018cd49: Merge "Add SELinux MAC to DrmManagerService." | Nick Kralevich | 2014-07-25 | 3 | -13/+91 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge "Add SELinux MAC to DrmManagerService." | Nick Kralevich | 2014-07-23 | 3 | -13/+91 |
| |\ \ \ \ | |||||
| | * | | | | Add SELinux MAC to DrmManagerService. | Riley Spahn | 2014-07-25 | 3 | -13/+91 |
* | | | | | | am cae00fcc: Merge "Remove last user of <cutils/tztime.h>." | Elliott Hughes | 2014-07-24 | 2 | -4/+2 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge "Remove last user of <cutils/tztime.h>." | Elliott Hughes | 2014-07-23 | 2 | -4/+2 |
| |\ \ \ \ \ | |||||
| | * | | | | | Remove last user of <cutils/tztime.h>. | Elliott Hughes | 2014-07-24 | 2 | -4/+2 |
| | |/ / / / | |||||
* | | | | | | am 3879792f: Merge "Remove 64-bit android_atomic uses from StateQueue." | Hans Boehm | 2014-07-23 | 2 | -12/+8 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge "Remove 64-bit android_atomic uses from StateQueue." | Hans Boehm | 2014-07-23 | 2 | -12/+8 |
| |\ \ \ \ \ | |||||
| | * | | | | | Remove 64-bit android_atomic uses from StateQueue. | Hans Boehm | 2014-07-23 | 2 | -12/+8 |
| |/ / / / / | |||||
* | | | | | | am 7878f087: (-s ours) Merge "stagefright: Fix seeking in MPEG4 container - d... | Lajos Molnar | 2014-07-22 | 0 | -0/+0 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge "stagefright: Fix seeking in MPEG4 container - do not merge" | Lajos Molnar | 2014-07-22 | 4 | -120/+97 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | stagefright: Fix seeking in MPEG4 container - do not merge | Lajos Molnar | 2014-07-22 | 4 | -120/+97 |
| |/ / / / | |||||
* | | | | | am 2e25819f: Merge "M3UParser: check for NULL before setting meta data" | Lajos Molnar | 2014-07-17 | 1 | -0/+6 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge "M3UParser: check for NULL before setting meta data" | Lajos Molnar | 2014-07-16 | 1 | -0/+6 |
| |\ \ \ \ | |||||
| | * | | | | M3UParser: check for NULL before setting meta data | Robert Shih | 2014-07-16 | 1 | -0/+6 |
| |/ / / / | |||||
* | | | | | am f839b8b4: Merge "Fix M3UParser relative path handling." | Lajos Molnar | 2014-07-16 | 1 | -1/+3 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge "Fix M3UParser relative path handling." | Lajos Molnar | 2014-07-16 | 1 | -1/+3 |
| |\ \ \ \ | |||||
| | * | | | | Fix M3UParser relative path handling. | Lajos Molnar | 2014-07-16 | 1 | -1/+3 |
| |/ / / / | |||||
* | | | | | am 787bdb33: Merge "Fix Externally reported security issue" | Nick Kralevich | 2014-07-14 | 1 | -1/+12 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge "Fix Externally reported security issue" | Nick Kralevich | 2014-07-14 | 1 | -1/+12 |
| |\ \ \ \ | |||||
| | * | | | | Fix Externally reported security issue | Jeff Tinker | 2014-07-11 | 1 | -1/+12 |
* | | | | | | am b7a88e31: Merge "h264_enc: Use free() to release memory allocated with mal... | Narayan Kamath | 2014-07-14 | 1 | -2/+2 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge "h264_enc: Use free() to release memory allocated with malloc()" | Narayan Kamath | 2014-07-10 | 1 | -2/+2 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | |