Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Add missing #includes" | Dan Albert | 2014-10-04 | 4 | -2/+7 |
|\ | |||||
| * | Add missing #includes | Bernhard Rosenkraenzer | 2014-09-27 | 4 | -2/+7 |
* | | Merge "Fix struct vs. class mismatches" | Chih-hung Hsieh | 2014-10-02 | 3 | -3/+3 |
|\ \ | |||||
| * | | Fix struct vs. class mismatches | Bernhard Rosenkraenzer | 2014-10-02 | 3 | -3/+3 |
|/ / | |||||
* | | Merge "Fix linkage when building with clang, Intel CC or gcc -O0" | Chih-hung Hsieh | 2014-09-30 | 1 | -0/+4 |
|\ \ | |/ |/| | |||||
| * | Fix linkage when building with clang, Intel CC or gcc -O0 | Bernhard Rosenkraenzer | 2014-09-28 | 1 | -0/+4 |
|/ | |||||
* | Merge "Allow building on clang without __builtin_assume_aligned" | Ian Rogers | 2014-09-26 | 1 | -1/+4 |
|\ | |||||
| * | Allow building on clang without __builtin_assume_aligned | Bernhard Rosenkraenzer | 2014-09-19 | 1 | -1/+4 |
* | | Merge "Fix comparison of String8 to char* literal" | Glenn Kasten | 2014-09-26 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Fix comparison of String8 to char* literal | Bernhard Rosenkraenzer | 2014-09-18 | 1 | -1/+1 |
* | | Merge "Fix a namespace collision." | Dan Albert | 2014-09-22 | 1 | -5/+5 |
|\ \ | |||||
| * | | Fix a namespace collision. | Dan Albert | 2014-09-22 | 1 | -5/+5 |
|/ / | |||||
* | | Merge "Check for NULL before calling asBinder()." | Dan Albert | 2014-09-22 | 1 | -1/+2 |
|\ \ | |/ |/| | |||||
| * | Check for NULL before calling asBinder(). | Dan Albert | 2014-09-16 | 1 | -1/+2 |
|/ | |||||
* | Merge "Clean up redundant links to stlport." | Dan Albert | 2014-09-11 | 2 | -2/+0 |
|\ | |||||
| * | Clean up redundant links to stlport. | Dan Albert | 2014-09-11 | 2 | -2/+0 |
|/ | |||||
* | Merge "Clean up some makefiles." | Dan Albert | 2014-09-11 | 2 | -6/+1 |
|\ | |||||
| * | Clean up some makefiles. | Dan Albert | 2014-09-11 | 2 | -6/+1 |
* | | 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 |
* | | 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 |
* | | | 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 |
* | | | 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 |
* | | | | 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 |
|/ / / / | |||||
* | | | | Merge "Use gettid directly." | Elliott Hughes | 2014-08-16 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Use gettid directly. | Elliott Hughes | 2014-08-18 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | 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 |
* | | | | | 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 |
* | | | | | 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 |
|/ / / / | |||||
* | | | | 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 |
* | | | | | 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 |
| |/ / / / | |||||
* | | | | | 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 |
|/ / / / / | |||||
* | | | | | 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 |
|/ / / / | |||||
* | | | | 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 |
|/ / / / | |||||
* | | | | 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 |
|/ / / / | |||||
* | | | | 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 |