summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove dead code.Chih-Hung Hsieh2014-10-071-8/+0
* Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-061-0/+3
|\
| * Add -no-integrated-as at local level.Chih-Hung Hsieh2014-10-061-0/+3
|/
* Merge "Add missing #includes"Dan Albert2014-10-044-2/+7
|\
| * Add missing #includesBernhard Rosenkraenzer2014-09-274-2/+7
* | Merge "Fix struct vs. class mismatches"Chih-hung Hsieh2014-10-023-3/+3
|\ \
| * | Fix struct vs. class mismatchesBernhard Rosenkraenzer2014-10-023-3/+3
|/ /
* | Merge "Fix linkage when building with clang, Intel CC or gcc -O0"Chih-hung Hsieh2014-09-301-0/+4
|\ \ | |/ |/|
| * Fix linkage when building with clang, Intel CC or gcc -O0Bernhard Rosenkraenzer2014-09-281-0/+4
|/
* Merge "Allow building on clang without __builtin_assume_aligned"Ian Rogers2014-09-261-1/+4
|\
| * Allow building on clang without __builtin_assume_alignedBernhard Rosenkraenzer2014-09-191-1/+4
* | Merge "Fix comparison of String8 to char* literal"Glenn Kasten2014-09-261-1/+1
|\ \ | |/
| * Fix comparison of String8 to char* literalBernhard Rosenkraenzer2014-09-181-1/+1
* | Merge "Fix a namespace collision."Dan Albert2014-09-221-5/+5
|\ \
| * | Fix a namespace collision.Dan Albert2014-09-221-5/+5
|/ /
* | Merge "Check for NULL before calling asBinder()."Dan Albert2014-09-221-1/+2
|\ \ | |/ |/|
| * Check for NULL before calling asBinder().Dan Albert2014-09-161-1/+2
|/
* Merge "Clean up redundant links to stlport."Dan Albert2014-09-112-2/+0
|\
| * Clean up redundant links to stlport.Dan Albert2014-09-112-2/+0
|/
* Merge "Clean up some makefiles."Dan Albert2014-09-112-6/+1
|\
| * Clean up some makefiles.Dan Albert2014-09-112-6/+1
* | Merge "Clean up test makefiles."Dan Albert2014-09-113-50/+3
|\ \ | |/ |/|
| * Clean up test makefiles.Dan Albert2014-09-113-50/+3
* | Merge "Add test for AMR-NB decoder"Glenn Kasten2014-09-112-0/+170
|\ \
| * | Add test for AMR-NB decoderAshok Bhat2014-06-162-0/+170
* | | Merge "Fix inline assembly for clang"Glenn Kasten2014-09-110-0/+0
|\ \ \ | |_|/ |/| |
| * | Fix inline assembly for clangBernhard Rosenkränzer2013-12-131-2/+2
* | | Merge "Fix in SoftAVCEncoder plugin"Narayan Kamath2014-09-041-3/+4
|\ \ \
| * | | Fix in SoftAVCEncoder pluginAshok Bhat2014-07-091-3/+4
* | | | Merge "Move chromium_http/support.cpp off androidGetTid."Elliott Hughes2014-08-161-1/+1
|\ \ \ \
| * | | | Move chromium_http/support.cpp off androidGetTid.Elliott Hughes2014-08-181-1/+1
|/ / / /
* | | | Merge "Use gettid directly."Elliott Hughes2014-08-161-1/+1
|\ \ \ \
| * | | | Use gettid directly.Elliott Hughes2014-08-181-1/+1
|/ / / /
* | | | Merge "Revert "Fix build after side-stepping global -Bsymbolic.""Dan Albert2014-08-073-25/+0
|\ \ \ \
| * | | | Revert "Fix build after side-stepping global -Bsymbolic."Dan Albert2014-08-083-25/+0
* | | | | Merge "Fix PIC relocations for non-Bsymbolic builds"Dan Albert2014-08-077-0/+29
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix PIC relocations for non-Bsymbolic buildsArd Biesheuvel2014-08-087-0/+29
* | | | | Merge "Fix build after side-stepping global -Bsymbolic."Dan Albert2014-08-073-0/+25
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix build after side-stepping global -Bsymbolic.Dan Albert2014-08-073-0/+25
|/ / / /
* | | | Merge "Add SELinux MAC to DrmManagerService."Nick Kralevich2014-07-233-13/+91
|\ \ \ \
| * | | | Add SELinux MAC to DrmManagerService.Riley Spahn2014-07-253-13/+91
* | | | | Merge "Remove last user of <cutils/tztime.h>."Elliott Hughes2014-07-232-4/+2
|\ \ \ \ \
| * | | | | Remove last user of <cutils/tztime.h>.Elliott Hughes2014-07-242-4/+2
| |/ / / /
* | | | | Merge "Remove 64-bit android_atomic uses from StateQueue."Hans Boehm2014-07-232-12/+8
|\ \ \ \ \
| * | | | | Remove 64-bit android_atomic uses from StateQueue.Hans Boehm2014-07-232-12/+8
|/ / / / /
* | | | | Merge "stagefright: Fix seeking in MPEG4 container - do not merge"Lajos Molnar2014-07-224-120/+97
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | stagefright: Fix seeking in MPEG4 container - do not mergeLajos Molnar2014-07-224-120/+97
|/ / / /
* | | | Merge "M3UParser: check for NULL before setting meta data"Lajos Molnar2014-07-161-0/+6
|\ \ \ \
| * | | | M3UParser: check for NULL before setting meta dataRobert Shih2014-07-161-0/+6
|/ / / /
* | | | Merge "Fix M3UParser relative path handling."Lajos Molnar2014-07-161-1/+3
|\ \ \ \