summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 0d64fcb4: Merge "Clean up some makefiles."Dan Albert2014-09-122-6/+1
|\
| * Merge "Clean up some makefiles."Dan Albert2014-09-112-6/+1
| |\
| | * Clean up some makefiles.Dan Albert2014-09-112-6/+1
* | | am 6bf7c5cf: Merge "Clean up test makefiles."Dan Albert2014-09-123-50/+3
|\ \ \ | |/ /
| * | Merge "Clean up test makefiles."Dan Albert2014-09-113-50/+3
| |\ \ | | |/ | |/|
| | * Clean up test makefiles.Dan Albert2014-09-113-50/+3
* | | am 2b16391d: Merge "Add test for AMR-NB decoder"Glenn Kasten2014-09-112-0/+170
|\ \ \ | |/ /
| * | Merge "Add test for AMR-NB decoder"Glenn Kasten2014-09-112-0/+170
| |\ \
| | * | Add test for AMR-NB decoderAshok Bhat2014-06-162-0/+170
* | | | am a9151741: Merge "Fix inline assembly for clang"Glenn Kasten2014-09-110-0/+0
|\ \ \ \ | |/ / /
| * | | Merge "Fix inline assembly for clang"Glenn Kasten2014-09-110-0/+0
| |\ \ \ | | |_|/ | |/| |
| | * | Fix inline assembly for clangBernhard Rosenkränzer2013-12-131-2/+2
* | | | am 032ecb7f: Merge "Fix in SoftAVCEncoder plugin"Narayan Kamath2014-09-041-3/+4
|\ \ \ \ | |/ / /
| * | | Merge "Fix in SoftAVCEncoder plugin"Narayan Kamath2014-09-041-3/+4
| |\ \ \
| | * | | Fix in SoftAVCEncoder pluginAshok Bhat2014-07-091-3/+4
* | | | | am 45d2c7e1: Merge "Move chromium_http/support.cpp off androidGetTid."Elliott Hughes2014-08-181-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | 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
| |/ / / /
* | | | | am d29b4f65: Merge "Use gettid directly."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
| |/ / / /
* | | | | am 5a192121: Merge "Revert "Fix build after side-stepping global -Bsymbolic.""Dan Albert2014-08-083-25/+0
|\ \ \ \ \ | |/ / / /
| * | | | 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
* | | | | | am 9ee1572f: Merge "Fix PIC relocations for non-Bsymbolic builds"Dan Albert2014-08-087-0/+29
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
* | | | | | am 07574544: Merge "Fix build after side-stepping global -Bsymbolic."Dan Albert2014-08-073-0/+25
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
| |/ / / /
* | | | | am a018cd49: Merge "Add SELinux MAC to DrmManagerService."Nick Kralevich2014-07-253-13/+91
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Add SELinux MAC to DrmManagerService."Nick Kralevich2014-07-233-13/+91
| |\ \ \ \
| | * | | | Add SELinux MAC to DrmManagerService.Riley Spahn2014-07-253-13/+91
* | | | | | am cae00fcc: Merge "Remove last user of <cutils/tztime.h>."Elliott Hughes2014-07-242-4/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
| | |/ / / /
* | | | | | am 3879792f: Merge "Remove 64-bit android_atomic uses from StateQueue."Hans Boehm2014-07-232-12/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
| |/ / / / /
* | | | | | am 7878f087: (-s ours) Merge "stagefright: Fix seeking in MPEG4 container - d...Lajos Molnar2014-07-220-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
| |/ / / /
* | | | | am 2e25819f: Merge "M3UParser: check for NULL before setting meta data"Lajos Molnar2014-07-171-0/+6
|\ \ \ \ \ | |/ / / /
| * | | | 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
| |/ / / /
* | | | | am f839b8b4: Merge "Fix M3UParser relative path handling."Lajos Molnar2014-07-161-1/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix M3UParser relative path handling."Lajos Molnar2014-07-161-1/+3
| |\ \ \ \
| | * | | | Fix M3UParser relative path handling.Lajos Molnar2014-07-161-1/+3
| |/ / / /
* | | | | am 787bdb33: Merge "Fix Externally reported security issue"Nick Kralevich2014-07-141-1/+12
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix Externally reported security issue"Nick Kralevich2014-07-141-1/+12
| |\ \ \ \